From 3010e03e2f2d0add9d111067f02eac49e23cc9be Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期四, 14 八月 2025 10:16:47 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/confirmation-sheet/components/add.vue | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/laboratory/src/views/dataManagement/confirmation-sheet/components/add.vue b/laboratory/src/views/dataManagement/confirmation-sheet/components/add.vue
index 7fec99d..8b64ebe 100644
--- a/laboratory/src/views/dataManagement/confirmation-sheet/components/add.vue
+++ b/laboratory/src/views/dataManagement/confirmation-sheet/components/add.vue
@@ -361,7 +361,7 @@
confirmSign: signatureImage, // 签字图片
signTime: new Date().toISOString(), // 签字时间
testMethodConfirmSheetTerms: this.testItems.map(item => ({
- id: this.formData.id?item.id:'', // 保留原有ID（编辑时使用）
+ id: '', // 保留原有ID（编辑时使用）
termCode: item.termCode,
termName: item.termName,
termType: item.termType,
@@ -406,7 +406,7 @@
dispatchId: this.selectedScheduling.id,
auditStatus: -1, // 草稿箱状态
testMethodConfirmSheetTerms: this.testItems.map(item => ({
- id: item.id, // 保留原有ID（编辑时使用）
+ id: '', // 保留原有ID（编辑时使用）
termCode: item.termCode,
termName: item.termName,
termType: item.termType,
@@ -440,8 +440,8 @@
if (res) {
// 设置实验调度数据
this.selectedScheduling = {
+ ...res,
id: res.dispatchId,
- ...res
}
this.tableData = [{
// planCode: res.projectName,
@@ -478,35 +478,6 @@
}
} catch (error) {
// this.$message.error('获取详情失败：' + (error.message || '未知错误'))
- }
- },
-
- async handleEditSubmit(signatureImage) {
- try {
- const submitData = {
- id: this.formData.id,
- dispatchId: this.selectedScheduling.id,
- auditStatus: 1,
- confirmSign: signatureImage,
- signTime: new Date().toISOString(),
- testMethodConfirmSheetTerms: this.testItems.map(item => ({
- id: item.id, // 保留原有ID
- termCode: item.termCode,
- termName: item.termName,
- termType: item.termType,
- termMethodCode: item.termMethodCode,
- termMethod: item.termMethod,
- sampleRequire: item.sampleRequire,
- status: item.status,
- testId: item.testId
- }))
- }
-
- await update(submitData)
- this.$message.success('更新成功')
- this.$router.push('/dataManagement/confirmation-sheet')
- } catch (error) {
- // this.$message.error('更新失败：' + (error.message || '未知错误'))
}
},
},
--
Gitblit v1.7.1