From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/a8-internal-audit-management/implementationPlan.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/do/a8-internal-audit-management/implementationPlan.vue b/src/components/do/a8-internal-audit-management/implementationPlan.vue
index 5f89ede..795530f 100644
--- a/src/components/do/a8-internal-audit-management/implementationPlan.vue
+++ b/src/components/do/a8-internal-audit-management/implementationPlan.vue
@@ -126,10 +126,16 @@
return null;
}
}
- },{
- label: '鎵瑰噯鍐呭',
- prop: 'ratifyRemark',
- minWidth: '100'
+ },
+ // {
+ // label: '鎵瑰噯鍐呭',
+ // prop: 'ratifyRemark',
+ // minWidth: '100'
+ // },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ minWidth: '100',
},
{
dataType: 'action',
--
Gitblit v1.9.3