From 0071c1757fced132b83d1110f7c59543fe891392 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 10 六月 2026 12:01:16 +0800
Subject: [PATCH] pro 1.请假审批、加班审批的申请人展示不一致 2.无形资产编辑已摊销完毕状态后，还是展示在用状态
---
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 4 +++-
src/views/financialManagement/assets/intangibleAssets.vue | 5 +++--
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 6 +++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/financialManagement/assets/intangibleAssets.vue b/src/views/financialManagement/assets/intangibleAssets.vue
index 9aef2bf..b2c13b1 100644
--- a/src/views/financialManagement/assets/intangibleAssets.vue
+++ b/src/views/financialManagement/assets/intangibleAssets.vue
@@ -72,7 +72,7 @@
</template>
<template #operation="{ row }">
<el-button type="primary" link @click="view(row)">鏌ョ湅</el-button>
- <el-button type="primary" link @click="edit(row)">缂栬緫</el-button>
+ <el-button v-if="row.status !== 'amortized'" type="primary" link @click="edit(row)">缂栬緫</el-button>
<el-button type="danger" link @click="handleDelete(row)">鍒犻櫎</el-button>
</template>
</PIMTable>
@@ -160,7 +160,7 @@
<el-select v-model="form.status" placeholder="璇烽�夋嫨鐘舵��" style="width: 100%;">
<el-option label="鍦ㄧ敤" value="in_use" />
<el-option label="闂茬疆" value="idle" />
- <el-option label="宸叉憡閿�瀹屾瘯" value="amortized" />
+ <el-option v-if="isView" label="宸叉憡閿�瀹屾瘯" value="amortized" />
</el-select>
</el-form-item>
</el-col>
@@ -244,6 +244,7 @@
);
const createDefaultForm = () => ({
+ id: null,
assetCode: "",
assetName: "",
category: "",
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index b9eb42f..58b612b 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -19,9 +19,9 @@
{{ approvalTypeLabel(row.approvalType) }}
</span>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
<el-descriptions-item v-if="row.rejectReason"
label="椹冲洖鍘熷洜"
:span="2">
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index 3f0e99c..9442a5a 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -140,7 +140,7 @@
const tableColumn = ref([
// { label: "鐢宠浜虹紪鍙�", prop: "applicantNo", width: 110 },
- { label: "鐢宠浜哄悕绉�", prop: "applicantName", minWidth: 100 },
+ { label: "鍙戣捣浜�", prop: "applicantName", minWidth: 100 },
{ label: "妯℃澘绫诲瀷", prop: "businessName", minWidth: 120 },
{
label: "瀹℃壒绫诲瀷",
@@ -154,7 +154,9 @@
prop: "unread",
width: 90,
align: "center",
+ dataType: "tag",
formatData: (v) => (v ? "鏄�" : "鍚�"),
+ formatType: (v) => (v ? "success" : "danger"),
},
{
label: "瀹℃壒鐘舵��",
--
Gitblit v1.9.3