From a749b62894ec0dcda3bb055371bc75db75f17ce1 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期一, 12 五月 2025 17:46:57 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/components/approvalProcess/index.vue | 51 +++++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/laboratory/src/components/approvalProcess/index.vue b/laboratory/src/components/approvalProcess/index.vue
index 5a0816b..6192e80 100644
--- a/laboratory/src/components/approvalProcess/index.vue
+++ b/laboratory/src/components/approvalProcess/index.vue
@@ -33,10 +33,10 @@
member.status === 'approved' ? 'success' : 'warning'
"
>
- {{ member.status === "approved" ? "同意" : "待审批" }}
+ {{ member.status}}
</div>
<div
- v-if="member.status === 'approved'"
+ v-if="member.status === '已确认'"
class="member-status-time"
>
{{ member.approveTime }}
@@ -108,19 +108,16 @@
// {
// title: '工艺工程师',
// members: [
- // {
- // fields: [
- // { label: '姓名', value: '张三' },
- // { label: '状态', value: '同意' },
- // { label: '审批时间', value: '2025-04-08 12:30' }
- // ],
+ // {
+ // name:'',
+ // status:'',
+ // approveTime:'',
// avatar: '' // 头像地址，可选
// },
// {
- // fields: [
- // { label: '姓名', value: '李四' },
- // { label: '状态', value: '待审批' }
- // ],
+ // name:'',
+ // status:'',
+ // approveTime:'',
// avatar: ''
// }
// ]
@@ -129,15 +126,13 @@
// title: '实验员',
// members: [
// {
- // fields: [
- // { label: '姓名', value: '王五' },
- // { label: '状态', value: '同意' },
- // { label: '审批时间', value: '2025-04-08 13:00' }
- // ],
+ // name:'',
+ // status:'',
+ // approveTime:'',
// avatar: ''
// }
// ]
- // }
+ // }
// ]
// }
// ]
@@ -213,15 +208,15 @@
border: 1px solid #dcdfe6;
margin-top: 10px;
- &:nth-child(1) {
- background: linear-gradient(
- to bottom,
- rgba(4, 156, 154, 0.2) 0%,
- rgba(5, 242, 194, 0) 70%
- );
- }
+ // &:nth-child(1) {
+ // background: linear-gradient(
+ // to bottom,
+ // rgba(4, 156, 154, 0.2) 0%,
+ // rgba(5, 242, 194, 0) 70%
+ // );
+ // }
- &:nth-child(2) {
+ &:nth-child(1) {
background: linear-gradient(
to bottom,
rgba(5, 160, 193, 0.2) 0%,
@@ -229,7 +224,7 @@
);
}
- &:nth-child(3) {
+ &:nth-child(2) {
background: linear-gradient(
to bottom,
rgba(255, 77, 79, 0.2) 0%,
@@ -237,7 +232,7 @@
);
}
- &:nth-child(4) {
+ &:nth-child(3) {
background: linear-gradient(
to bottom,
rgba(250, 199, 20, 0.21) 0%,
--
Gitblit v1.7.1