diff --git a/src/views/changeLedger/myChanges/index.vue b/src/views/changeLedger/myChanges/index.vue index 25cba2e..e49db45 100644 --- a/src/views/changeLedger/myChanges/index.vue +++ b/src/views/changeLedger/myChanges/index.vue @@ -1,441 +1,19 @@ @@ -622,10 +290,20 @@ onMounted(() => { > 全部变更 - {{ finalRows.length }} + {{ pagination.itemCount }} - - + { 显示未关闭
- +
@@ -695,52 +373,95 @@ onMounted(() => {
-
+
- {{ String(i + 1).padStart(2, '0') }} - {{ r.title }} + {{ Number(i)+1 }} +

+ {{ r.title }} +

紧急 - {{ r.id }} + {{ r.change_no }}
- {{ r.type }} - {{ r.level }} - {{ r.duration }} - {{ s }} + + + {{ matchObj(typeList,r.change_type)?.label }} + + + + {{ matchObj(levelList,r.change_level)?.label }} + + 临时 + 永久 + 延期
- 申请 {{ r.applyTime }} - {{ r.dept }} · {{ r.applicant }} - 计划投用 {{ r.planUse }} - 实际投用 {{ LEDGER_EXTRA[r.id].actualUse }} - 计划恢复 {{ LEDGER_EXTRA[r.id].planRestore }} - 延期后恢复 {{ LEDGER_EXTRA[r.id].extRestore }} - 关闭 {{ LEDGER_EXTRA[r.id].closeTime }} - 状态更新 {{ r.statusTime }} + 申请 {{ r.apply_time?.slice(0,16) }} + {{ r.org_name }} · {{ r.applicant_name }} + 计划投用 {{ r.plan_use_date?.slice(0,16) }} + 实际投用 {{ r.use_time?.slice(0,16) }} + 计划恢复 {{ r.restore_deadline?.slice(0,16) }} + 关闭 {{ r.close_time?.slice(0,16) }} + 状态更新 {{ r.status_changed_at?.slice(0,16) }}
- {{ r.statusDetail }} - {{ r.status }} - 超期 {{ r.overdueDays }} 天 + + 审批中 + 已通过 + 待验收 + 待关闭 + 已关闭 + 已撤回 + 已驳回 + + 超期 {{ r.overdue_days }} 天
+
- - {{ op.label }} - + + 撤回 + + 未实施情况说明 + 下载申请表 + + 下载 + + 下载归档包 + + 催办 + 详情 + 进度
-
临时变更恢复 / 延期 / 转永久请在详情页中操作
+ +
临时变更恢复 / 延期 / 转永久请在详情页中操作
-
当前筛选条件下暂无变更记录
+
当前筛选条件下暂无变更记录
{ > - + -
-
{{ progressRow?.title }}
-
- {{ progressRow?.id }} - {{progressRow.status}} - {{progressRow.status}} - {{progressRow.status}} - {{progressRow.status}} - 超期 {{ progressRow?.day }} 天 -
-
{{ [progressRow?.dept, progressRow?.applicant].filter(Boolean).join(' · ') }}
-
{{ progressRow?.meta }}
+
+
{{ currentRow?.title }}
+
+ {{ currentRow?.change_no }} + 审批中 + 已通过 + 待验收 + 待关闭 + 已关闭 + 已撤回 + 已驳回 + 超期 {{ currentRow?.overdue_days }} 天
-
-
-
- - - - {{ i + 1 }} - - -
-
-
- {{ s }}{{ i === curIdx && !closed ? '（当前）' : '' }} -
-
{{ timeOf(i) }}
-
- {{ [progressRow?.detail, progressRow?.updateTime ? `更新 ${progressRow?.updateTime}` : ''].filter(Boolean).join(' · ') }} -
-
-
-
-
- 临时变更：计划恢复 {{ progressRow?.deadline ?? '—' }}{{ progressRow?.extended ? ` · 延期后恢复 ${progressRow?.deadline}` : '' }} · 恢复 / 延期 / 转永久请在详情页中操作 +
{{ [currentRow?.dept, currentRow?.applicant].filter(Boolean).join(' · ') }}
+
{{ currentRow?.meta }}
+
+
+
+
+ + + + +
+
+

{{ s.action }}

+ {{s.finished_at?.slice(0, 16)}} +
+
+
+ 临时变更：计划恢复 {{ currentRow?.restore_deadline ?? '—' }} · 恢复 / 延期 / 转永久请在详情页中操作 +
diff --git a/src/views/details/index/index.vue b/src/views/details/index/index.vue index f8b98af..c857a56 100644 --- a/src/views/details/index/index.vue +++ b/src/views/details/index/index.vue @@ -15,6 +15,8 @@ const { routerPushByKey } = useRouterPush(); const route = useRoute(); const loading = ref(false); +// 返回键 +const backKey = ref(''); // 判定说明 const typeAiLoading = ref(false); const typeAi = ref<{ type: string; confidence: number; conclusion: string; hit_rules: string[]; exclude_rules: string[]; knowledge_refs: string[] } | null>(null); @@ -233,7 +235,7 @@ const openTypeSheet = async () => { // 返回 const back = () => { - routerPushByKey('my_mytask'); + routerPushByKey(backKey.value as any); }; // 导出 @@ -381,6 +383,9 @@ onMounted(async () => { if(route.query.status){ currentStatus.value = route.query.status.toString(); } + if(route.query.key){ + backKey.value = route.query.key.toString(); + } } }) diff --git a/src/views/my/myTask/index.vue b/src/views/my/myTask/index.vue index cdaf657..3f4e69b 100644 --- a/src/views/my/myTask/index.vue +++ b/src/views/my/myTask/index.vue @@ -67,23 +67,23 @@ const tabChange = (k: string) => { // 处置申请跳转 const jumpTo = (act: string) => { - routerPushByKey("details_disposal",{ query: { id: currentRow.value?.change_id.toString(),type:act } }); + routerPushByKey("details_disposal",{ query: { id: currentRow.value?.change_id?.toString(),type:act } }); } // 打开详情、修改重报 const openDetail = (c: any,type:string = '') => { console.log(c) if(type==='detail'){ - routerPushByKey("details_index",{ query: { id: c.change_id.toString(),status:c.status.toString() || '' } }); + routerPushByKey("details_index",{ query: { id: c?.change_id?.toString(),status:c?.status?.toString() || '',key:'my_mytask' } }); } if(type==='edit'){ - routerPushByKey("my_initiatechange",{ query: { id: c.change_id.toString() } }); + routerPushByKey("my_initiatechange",{ query: { id: c?.change_id?.toString() } }); } }; // 打开资料关闭 const openDocClose = (c: any) => { currentRow.value = c; - routerPushByKey("details_closedoc",{ query: { id: c.change_id.toString() } }); + routerPushByKey("details_closedoc",{ query: { id: c?.change_id?.toString() } }); }; // 打开处置申请 const openDisposal = (c: any,) => {