From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
src/views/project/travelexpenseapply/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index a8c740f..89d2c2f 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -158,7 +158,7 @@
</template>
</el-table-column>
<el-table-column
- label="鐢宠鏉愭枡鐘舵��"
+ label="鏉愭枡棰勫鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -2607,7 +2607,7 @@
//鏄庢樉鎻愮ず瀹℃壒閫�鍥炶褰�
rowClassName({ row, column, rowIndex, columnIndex }) {
//姝ゅ垽鏂负鏈�鍚庝笁琛�
- if (row.recordstatus == -1 && row.backflowlevel >= 0) {
+ if (row.recordstatus == -1 && row.backflowlevel != null) {
return "error-row";
}
return "";
@@ -2623,7 +2623,7 @@
background: #e8f4ff !important;
/* color:whitesmoke; */
}
-.button-delete{
+.button-delete {
color: rgb(236, 69, 69);
}
::v-deep.el-table .error-row {
--
Gitblit v1.9.3