/

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)
+  taskTransferFormRef.value.open(id)ddsdsdsdddddddddsdsd
 }
 
 /** 处理审批退回的操作 */

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

@@ -171,17 +171,17 @@
               <el-button
                 link
                 type="primary"
-                @click="openForm('update',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.studentId)"
+                @click="openForm('update',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.studentId,4)"
                 v-hasPermi="['system:student-select-supervisor-record:update']"
-                v-if="userInfo.userType==='4' && scope.row.selectType === 1 || userInfo.userType==='4' && scope.row.selectType === 2"
+                v-if="userInfo.userType==='4' && scope.row.selectType === 1 || userInfo.userType==='4' && scope.row.selectType === 2 || userInfo.userType==='4' && scope.row.selectType === 4"
               >
                 志愿编辑
               </el-button>
               <el-button
                 link
                 type="primary"
-                v-if="scope.row.selectType === 2 && userInfo.userType==='4'"
-                @click="openForm('end',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.studentId)"
+                v-if="scope.row.selectType === 2 && userInfo.userType==='4' || scope.row.selectType === 4 && userInfo.userType==='4'"
+                @click="openForm('end',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.studentId,null)"
               >
                 详情
               </el-button>
@@ -250,7 +250,8 @@ const queryParams = reactive({
   studentName:"",
   createTime: [],
   projectName:"",
-  studentGrade:""
+  studentGrade:"",
+  selectType: undefined,
 })
 
 const recordData = ref({
@@ -303,8 +304,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, projectId?: number,supervisorId? :number,id?:number,studentId?:number) => {
-  formRef.value.open(type, projectId,supervisorId,id,studentId)
+const openForm = (type: string, projectId?: number,supervisorId? :number,id?:number,studentId?:number,selectType?:number) => {
+  formRef.value.open(type, projectId,supervisorId,id,studentId,selectType)
 }
 const handelWithdraw = async (id:number) => {
   try {
@@ -522,7 +523,7 @@ const getRecordList = async () => {
   try {
     const data = await studentSelectSupervisorRecordApi.getStudentSelectSupervisorRecordPage(queryParams)
     selectionList.value = data
-    // console.log("selectionList", selectionList.value);
+    console.log("selectionList", selectionList.value);
     selectionList.value = data.list
     total.value = data.total
   } finally {

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

@@ -117,16 +117,7 @@
           </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>
@@ -287,7 +278,7 @@ const getSupervisorSignature = async() => {
 
 const showPrintButton = ref(false); // 控制打印按钮的显示
 /** 打开弹窗 */
-const open = async (type: string, projectId?: number, supervisorId?:number, id?:number, studentId?:number) => {
+const open = async (type: string, projectId?: number, supervisorId?:number, id?:number, studentId?:number, selectType?:number) => {
   dialogVisible.value = true;
  
   if (type === 'create'){
@@ -374,7 +365,8 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
       formLoading.value = true
       try {
         formData.value = await studentSelectSupervisorRecordApi.getStudentSelectSupervisorRecord(id)
-        // console.log(formData.value,'formData.value');
+        formData.value.selectType = selectType
+        console.log(formData.value,'formData.value');
       } finally {
         formLoading.value = false
       }
@@ -442,8 +434,10 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
     if(id) {
       formLoading.value = true
       try {
-        formData.value.id = id
         formData.value = await studentSelectSupervisorRecordApi.getStudentSelectSupervisorRecord(id)
+        formData.value.id = id
+        // formData.value.selectType = selectType
+        console.log(formData.value,'formData.value');
       } finally {
         formLoading.value = false
       }
@@ -472,7 +466,9 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
     if(id) {
       formLoading.value = true
       try {
+        // formData.value.selectType = selectType
         formData.value = await studentSelectSupervisorRecordApi.getStudentSelectSupervisorRecord(id)
+        console.log(formData.value,'formData.value');
       } finally {
         formLoading.value = false
       }

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

@@ -101,7 +101,7 @@
           <!-- 待处理 -->
           <el-button
             type="text"
-            @click="openForm('updateone',scope.row.projectId,scope.row.selectSupervisorId,scope.row.recordId,scope.row.id)"
+            @click="openForm('updateone',scope.row.projectId,scope.row.selectSupervisorId,scope.row.recordId,scope.row.id,4)"
             v-hasPermi="['system:student-select-supervisor-record:update']"
             v-if="scope.row.selectStatus === 1"
           >
@@ -110,7 +110,7 @@
           <!-- 未提交 -->
           <el-button
             type="text"
-            @click="openForm('updatetwo',  scope.row.projectId,null,scope.row.recordId,scope.row.id)"
+            @click="openForm('updatetwo',  scope.row.projectId,null,scope.row.recordId,scope.row.id,4)"
             v-hasPermi="['system:student-select-supervisor-record:collegeCreate']"
             v-if="scope.row.selectStatus === 0"
           >
@@ -220,8 +220,8 @@ const resetQuery = () => {
 }
 
 const formRef = ref(); // 确保初始化为 null
-const openForm = (type: string, projectId?: number, supervisorId?:number, id?:number, studentId?:number) => {
-  formRef.value.open(type, projectId, supervisorId, id, studentId)
+const openForm = (type: string, projectId?: number, supervisorId?:number, id?:number, studentId?:number, selectType?:number) => {
+  formRef.value.open(type, projectId, supervisorId, id, studentId, selectType)
 }
 
 

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

@@ -104,7 +104,7 @@
         <template #default="scope">
           <el-button
             type="text"
-            @click="openForm('updateone',scope.row.projectId,scope.row.selectSupervisorId,scope.row.recordId,scope.row.id)"
+            @click="openForm('updateone',scope.row.projectId,scope.row.selectSupervisorId,scope.row.recordId,scope.row.id,4)"
             v-hasPermi="['system:student-select-supervisor-record:update']"
           >
             志愿编辑
@@ -212,8 +212,8 @@ const resetQuery = () => {
 }
 
 const formRef = ref(); // 确保初始化为 null
-const openForm = (type: string, projectId?: number, supervisorId?:number, recordId?:number, studentId?:number) => {
-  formRef.value.open(type, projectId, supervisorId, recordId, studentId)
+const openForm = (type: string, projectId?: number, supervisorId?:number, recordId?:number, studentId?:number, selectType?:number) => {
+  formRef.value.open(type, projectId, supervisorId, recordId, studentId, selectType)
 }
 
 onMounted(() => {