From bc48a619a1ddf7661ac4d3e80b1e32a17c696f0c Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期三, 09 四月 2025 10:36:33 +0800
Subject: [PATCH] 优化逻辑，修改审核流程样式
---
src/views/dataManagement/dispatching/list.vue | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/views/dataManagement/dispatching/list.vue b/src/views/dataManagement/dispatching/list.vue
index 6db5e11..9d24ada 100644
--- a/src/views/dataManagement/dispatching/list.vue
+++ b/src/views/dataManagement/dispatching/list.vue
@@ -108,16 +108,23 @@
:visible="signatureDialogVisible"
@confirm="handleSignatureConfirm"
/>
+ <edit-dispatch
+ :visible.sync="approvalDialogVisible"
+ :type="approvalDialogType"
+ :data="currentApprovalData"
+ />
</div>
</template>
<script>
import SignatureCanvas from "@/components/SignatureCanvas.vue";
+import EditDispatch from "./editDispatch.vue";
export default {
name: "dispatchingList",
components: {
SignatureCanvas,
+ EditDispatch,
},
data() {
return {
@@ -140,6 +147,35 @@
participants: "张三、李四、王五",
createTime: "2024-03-15",
status: "pending",
+ planName: "新材料研发项目",
+ planCode: "PLAN-2024-001",
+ stage: "实验阶段",
+ testDate: "2024-03-20",
+ testName: "材料力学性能测试",
+ testCode: "TEST-2024-001",
+ testTime: "2024-03-20 09:00",
+ groupTableData: [
+ {
+ groupName: "对照组",
+ remark: "标准材料组"
+ },
+ {
+ groupName: "实验组",
+ remark: "新材料组"
+ }
+ ],
+ taskTableData: [
+ {
+ taskName: "材料准备",
+ leader: "张三",
+ startTime: "2024-03-20 09:00"
+ },
+ {
+ taskName: "性能测试",
+ leader: "李四",
+ startTime: "2024-03-20 10:00"
+ }
+ ]
},
{
experimentCode: "EXP-2024-002",
@@ -173,6 +209,9 @@
],
signatureDialogVisible: false,
currentRow: null,
+ approvalDialogVisible: false,
+ approvalDialogType: "view",
+ currentApprovalData: null,
};
},
created() {
@@ -215,8 +254,12 @@
});
},
handleConfirm(row) {
- this.currentRow = row;
- this.signatureDialogVisible = true;
+ // this.currentRow = row;
+ // this.signatureDialogVisible = true;
+
+ this.currentApprovalData = row;
+ this.approvalDialogType = "approve";
+ this.approvalDialogVisible = true;
},
handleSignatureConfirm(imageData) {
console.log("imageData imageData", imageData);
--
Gitblit v1.7.1