mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-15 13:22:49 +00:00
perf: 优化审批通知标题
This commit is contained in:
parent
0c64cf0546
commit
a6acb7ea0d
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\Api;
|
namespace App\Http\Controllers\Api;
|
||||||
|
|
||||||
|
use App\Module\Doo;
|
||||||
use Request;
|
use Request;
|
||||||
use Session;
|
use Session;
|
||||||
use Response;
|
use Response;
|
||||||
@ -992,11 +993,12 @@ class ApproveController extends AbstractController
|
|||||||
'is_finished' => $process['is_finished'],
|
'is_finished' => $process['is_finished'],
|
||||||
'data' => $data
|
'data' => $data
|
||||||
];
|
];
|
||||||
|
$procDefName = Doo::translate($data['proc_def_name']);
|
||||||
$msgData['title'] = match ($type) {
|
$msgData['title'] = match ($type) {
|
||||||
'approve_reviewer' => $data['nickname'] . " 提交的「{$data['proc_def_name']}」待你审批",
|
'approve_reviewer' => $data['nickname'] . " 提交的「{$procDefName}」待你审批",
|
||||||
'approve_notifier' => "抄送 {$data['nickname']} 提交的「{$data['proc_def_name']}」记录",
|
'approve_notifier' => "抄送 {$data['nickname']} 提交的「{$procDefName}」记录",
|
||||||
'approve_comment_notifier' => $data['comment_nickname'] . " 评论了 {$data['nickname']} 的「{$data['proc_def_name']}」审批",
|
'approve_comment_notifier' => $data['comment_nickname'] . " 评论了 {$data['nickname']} 的「{$procDefName}」审批",
|
||||||
'approve_submitter' => $action == 'pass' ? "您发起的「{$data['proc_def_name']}」已通过" : "您发起的「{$data['proc_def_name']}」被 {$data['nickname']} 拒绝",
|
'approve_submitter' => $action == 'pass' ? "您发起的「{$procDefName}」已通过" : "您发起的「{$procDefName}」被 {$data['nickname']} 拒绝",
|
||||||
default => '不支持的指令',
|
default => '不支持的指令',
|
||||||
};
|
};
|
||||||
if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') {
|
if ($action == 'withdraw' || $action == 'pass' || $action == 'refuse') {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="open-approve-details" :data-id="msg.data.id">
|
<div class="open-approve-details" :data-id="msg.data.id">
|
||||||
<b>{{ $L(`${msg.data.comment_nickname} 评论了 ${msg.data.nickname} 的「${msg.data.proc_def_name}」审批`) }}</b>
|
<b>{{ $L(`${msg.data.comment_nickname} 评论了 ${msg.data.nickname} 的「${$L(msg.data.proc_def_name)}」审批`) }}</b>
|
||||||
<div class="cause">
|
<div class="cause">
|
||||||
<p>{{$L('申请人')}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
<p>{{$L('申请人')}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
||||||
<b>{{$L('评论内容')}}</b>
|
<b>{{$L('评论内容')}}</b>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="open-approve-details" :data-id="msg.data.id">
|
<div class="open-approve-details" :data-id="msg.data.id">
|
||||||
<b>{{ $L(`抄送 ${msg.data.nickname} 提交的「${msg.data.proc_def_name}」记录`) }}</b>
|
<b>{{ $L(`抄送 ${msg.data.nickname} 提交的「${$L(msg.data.proc_def_name)}」记录`) }}</b>
|
||||||
<div class="cause">
|
<div class="cause">
|
||||||
<p>{{$L("申请人")}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
<p>{{$L("申请人")}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
||||||
<b>{{$L("详情")}}</b>
|
<b>{{$L("详情")}}</b>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="open-approve-details" :data-id="msg.data.id">
|
<div class="open-approve-details" :data-id="msg.data.id">
|
||||||
<b>{{ $L(`${msg.data.nickname} 提交的「${msg.data.proc_def_name}」待你审批`) }}</b>
|
<b>{{ $L(`${msg.data.nickname} 提交的「${$L(msg.data.proc_def_name)}」待你审批`) }}</b>
|
||||||
<div class="cause">
|
<div class="cause">
|
||||||
<p>{{$L("申请人")}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
<p>{{$L("申请人")}}:<span class="mark-color">@{{ msg.data.nickname }}</span> {{ msg.data.department }}</p>
|
||||||
<b>{{$L("详情")}}</b>
|
<b>{{$L("详情")}}</b>
|
||||||
|
|||||||
@ -27,7 +27,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
title({msg}) {
|
title({msg}) {
|
||||||
return msg.action === 'pass' ? `您发起的「${msg.data.proc_def_name}」已通过` : `您发起的「${msg.data.proc_def_name}」被 ${msg.data.nickname} 拒绝`
|
return msg.action === 'pass' ? `您发起的「${this.$L(msg.data.proc_def_name)}」已通过` : `您发起的「${this.$L(msg.data.proc_def_name)}」被 ${msg.data.nickname} 拒绝`
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {},
|
methods: {},
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user