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/fund/medicalCostApply/index.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index a55a221..208cc78 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -175,7 +175,7 @@
</template>
</el-table-column>
<el-table-column
- label="鐢宠鏉愭枡鐘舵��"
+ label="鏉愭枡棰勫鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -219,7 +219,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['project:medicalfund:edit']"
>淇敼</el-button
>
<el-button
@@ -237,7 +236,6 @@
size="mini"
type="text"
@click="handleDelete(scope.row)"
- v-hasPermi="['project:medicalfund:delete']"
><span class="button-delete"
><i class="el-icon-delete"></i>鍒犻櫎</span
></el-button
@@ -247,7 +245,6 @@
type="text"
icon="el-icon-download"
@click="mixExport(scope.row.id)"
- v-hasPermi="['project:medicalfund:download']"
>涓嬭浇</el-button
>
</template>
@@ -548,7 +545,7 @@
id: 0,
businessType: "3",
operationType: "add",
- curCase: this.curCase
+ curCase: this.curCase,
}
});
} else {
@@ -1469,7 +1466,7 @@
}
},
rowClassName({ row, column, rowIndex, columnIndex }) {
- if (row.recordstatus == -1 && row.backflowlevel >= 0) {
+ if (row.recordstatus == -1 && row.backflowlevel != null) {
return "error-row";
}
return "";
@@ -1479,7 +1476,7 @@
</script>
<style lang="scss" scoped>
/* @import url(); 寮曞叆鍏叡css绫� */
-.button-delete{
+.button-delete {
color: rgb(236, 69, 69);
}
::v-deep.el-table .error-row {
--
Gitblit v1.9.3