From e950c38ba82e5e6bc8b0c50c35e5dbb6a180165a Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期二, 20 五月 2025 16:43:06 +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/confirm-dialog.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/laboratory/src/views/dataManagement/confirmation-sheet/components/confirm-dialog.vue b/laboratory/src/views/dataManagement/confirmation-sheet/components/confirm-dialog.vue
index 9ea7048..45d6337 100644
--- a/laboratory/src/views/dataManagement/confirmation-sheet/components/confirm-dialog.vue
+++ b/laboratory/src/views/dataManagement/confirmation-sheet/components/confirm-dialog.vue
@@ -23,19 +23,19 @@
</div>
</div>
- <Table :tableData="sampleData" :total="0" :height="null">
+ <Table :data="sampleData" :total="0" :height="null">
<template>
- <el-table-column prop="index" label="序号" width="60" align="center"></el-table-column>
- <el-table-column prop="testName" label="检测项名称"></el-table-column>
- <el-table-column prop="testCode" label="检测项编号"></el-table-column>
- <el-table-column prop="testType" label="定性/定量" align="center">
+ <el-table-column type="index" label="序号" width="60" align="center"></el-table-column>
+ <el-table-column prop="termName" label="检测项名称"></el-table-column>
+ <el-table-column prop="termCode" label="检测项编号"></el-table-column>
+ <el-table-column prop="termType" label="定性/定量" align="center">
<template slot-scope="scope">
- {{ scope.row.testType === 1 ? '定性' : '定量' }}
+ {{ scope.row.termType === 1 ? '定性' : '定量' }}
</template>
</el-table-column>
- <el-table-column prop="methodCode" label="检测方法编号"></el-table-column>
- <el-table-column prop="methodName" label="检测方法"></el-table-column>
- <el-table-column prop="requirements" label="收样要求" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="termMethodCode" label="检测方法编号"></el-table-column>
+ <el-table-column prop="termMethod" label="检测方法"></el-table-column>
+ <el-table-column prop="sampleRequire" label="收样要求" show-overflow-tooltip></el-table-column>
</template>
</Table>
@@ -53,7 +53,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button>
- <el-button type="primary" @click="handleConfirm" :disabled="!imgSrc">确 认</el-button>
+ <el-button type="primary" @click="handleConfirm">确 认</el-button>
</div>
<SignatureCanvas
@@ -115,8 +115,12 @@
},
handleConfirm() {
if (!this.imgSrc) {
- this.$message.warning("请先完成签名确认");
- return;
+ this.$message({
+ type: 'warning',
+ message: '请先完成签名确认',
+ duration: 2000
+ })
+ return
}
this.$emit("confirm", this.imgSrc);
this.handleClose();
--
Gitblit v1.7.1