diff --git a/src/views/applyList/detail.vue b/src/views/applyList/detail.vue
index d15ca9d..55b2503 100644
--- a/src/views/applyList/detail.vue
+++ b/src/views/applyList/detail.vue
@@ -52,8 +52,8 @@ const jumpTo = (val) => {
})
}
}
-// 同意
-const agree = async () => {
+// 同意/消息确认
+const agree = async (type) => {
loading.value = true;
try {
await approvalApi(params.value?.id,{
@@ -63,7 +63,7 @@ const agree = async () => {
safety_measures: info.value?.safety_measures,
cosign_item_id: info.value?.cosign_item_id,//审核人id
});
- showNotify({ message: '同意成功', background: '#00b42a' });
+ showNotify({ message: type==='agree'? '同意成功' : '消息确认成功', background: '#00b42a' });
jumpTo(params.value?.type==='wait'?1:0);
} finally {
loading.value = false;
@@ -190,28 +190,33 @@ onMounted(() => {
+
-
-
班长:
-
{{info?.apply_user?.realname}}
+
申请人&风险辨识:
+
班长
+
{{info?.apply_user?.realname}}
+
-
-
车间工程师:
-
{{info?.apply_user?.realname}}
+
申请人:
+
车间工程师
+
{{info?.apply_user?.realname}}
-
-
-
{{sItem.dept_name}}:
-
{{sItem.user_name}}
+
+
+
+
{{item.step_name}}:
+
{{sItem.dept_name}}
+
{{sItem.user_name}}
+
+
{{(sItem.signed_at)?.slice(0,16)}}
-
{{(sItem.signed_at)?.slice(0,16)}}
@@ -231,8 +236,15 @@ onMounted(() => {
((info?.template_id==2 || info?.template_id==3) && (info?.current_step>=1 && info?.current_step<=4))) ||
info?.template_id==5
">
-
同意
-
驳回
+
同意
+
驳回
+
+
@@ -328,7 +340,7 @@ onMounted(() => {
.timeline:before {
content: '';
width: 1px;
- height: calc(100% - 6px);
+ height: calc(100% - 16px);
background: #1989fa;
position: absolute;
top: 3px;
@@ -337,7 +349,6 @@ onMounted(() => {
.timeline-item {
display: flex;
align-items: center;
- justify-content: space-between;
position: relative;
}
.timeline-item .left {
@@ -352,4 +363,10 @@ onMounted(() => {
border-radius: 50%;
margin-right: 10px;
}
+.time {
+ margin-top: 2px;
+}
+.name {
+ margin-left: 10px;
+}
diff --git a/src/views/applyList/lockDetail.vue b/src/views/applyList/lockDetail.vue
index 761b2c4..2933302 100644
--- a/src/views/applyList/lockDetail.vue
+++ b/src/views/applyList/lockDetail.vue
@@ -48,7 +48,7 @@ const getOrg = (data) => {
}
// 同意
-const agree = async () => {
+const agree = async (type) => {
loading.value = true;
try {
await approvalApi(params.value?.id,{
@@ -58,7 +58,7 @@ const agree = async () => {
safety_measures: info.value?.safety_measures,
cosign_item_id: info.value?.cosign_item_id,//审核人id
});
- showNotify({ message: '同意成功', background: '#00b42a' });
+ showNotify({ message: type==='agree'? '同意成功' : '消息确认成功', background: '#00b42a' });
jumpTo(params.value?.type==='wait'?1:0);
} finally {
loading.value = false;
@@ -183,8 +183,15 @@ onMounted(() => {
((info?.template_id==2 || info?.template_id==3) && (info?.current_step>=1 && info?.current_step<=4))) ||
info?.template_id==5
">
-
同意
-
驳回
+
同意
+
驳回
+
+