|
@@ -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
|
|
|
}
|