修复日报/月报详情页返回目标写死,团队视角进入会被送回"我的"列表
DailyReportCard/月报列表的报告条目在 team=true(团队统计)和 team=false(我的日报/月报)两种 模式下渲染的是同一个组件、同一个"查看详情"跳转,但 DailyReportDetail/MonthlyReportDetail 的返回目标写死成 daily-report-mine/monthly-report-mine——管理者从"团队统计"点进某条下属的 报告,返回却被送到自己的"我的日报/月报"而不是刚才浏览的团队列表。跳转时带上 team 参数, 详情页据此选择正确的返回目标,和同文件里 DailyReportList/MonthlyReportList 自己的 `team ? 'x' : 'workbench'` 返回逻辑保持一致模式。 Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
290fc80f3e
commit
5e173c55e8
+10
-6
@@ -21600,7 +21600,8 @@ function DailyReportCard({
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
onClick: () => navigate('daily-report-detail', {
|
||||
report_id: report.report_id
|
||||
report_id: report.report_id,
|
||||
team: team ? '1' : ''
|
||||
}),
|
||||
children: ["查看详情", (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Icon, {
|
||||
children: "chevron_right"
|
||||
@@ -21741,6 +21742,7 @@ function DailyReportDetail({
|
||||
onToast
|
||||
}) {
|
||||
const reportId = hashParams && hashParams.report_id;
|
||||
const backTarget = hashParams && hashParams.team ? 'daily-report-team' : 'daily-report-mine';
|
||||
const [report, setReport] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(() => reportId && (0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.readCachedData)('daily-report:' + reportId) || null);
|
||||
const [loadError, setLoadError] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(false);
|
||||
const names = useUserNames(report ? [report.author_id] : [], myUserId);
|
||||
@@ -21759,7 +21761,7 @@ function DailyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "daily-report-mine"
|
||||
back: backTarget
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
children: (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("p", {
|
||||
className: "organization-loading",
|
||||
@@ -21771,7 +21773,7 @@ function DailyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "daily-report-mine"
|
||||
back: backTarget
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
className: "report-detail",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
@@ -22064,7 +22066,8 @@ function MonthlyReportList({
|
||||
}, void 0, false) : filtered.map(r => (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
onClick: () => navigate((r.action || (r.status === 'submitted' ? 'view' : 'edit')) === 'view' ? 'monthly-report-detail' : 'monthly-report-editor', {
|
||||
report_id: r.report_id
|
||||
report_id: r.report_id,
|
||||
team: team ? '1' : ''
|
||||
}),
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
className: "report-month",
|
||||
@@ -22094,6 +22097,7 @@ function MonthlyReportDetail({
|
||||
onToast
|
||||
}) {
|
||||
const reportId = hashParams && hashParams.report_id;
|
||||
const backTarget = hashParams && hashParams.team ? 'monthly-report-team' : 'monthly-report-mine';
|
||||
const [report, setReport] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(() => reportId && (0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.readCachedData)('monthly-report:' + reportId) || null);
|
||||
const [loadError, setLoadError] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(false);
|
||||
const [reopening, setReopening] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(false);
|
||||
@@ -22113,7 +22117,7 @@ function MonthlyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "monthly-report-mine"
|
||||
back: backTarget
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
children: (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("p", {
|
||||
className: "organization-loading",
|
||||
@@ -22133,7 +22137,7 @@ function MonthlyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "monthly-report-mine"
|
||||
back: backTarget
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
className: "report-detail",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user