From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/goalManagement/IncentiveRecording/index.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index 2bc38a7..214dadb 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -28,7 +28,8 @@
<div class="btns">
<div>
<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
- <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
+ <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
+ @click="openD('修改', editRow)">修改</el-button>
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除 </el-button>
</div>
<div>
@@ -179,7 +180,9 @@
const warning = ref(true);
const danger = ref(true);
const deletAll = ref();
+ const editRow = ref()
const handleSelectionChange = (val: any) => {
+ editRow.value = val[0]
let valId = JSON.parse(JSON.stringify(val));
let arr = [];
for (let i = 0; i < valId.length; i++) {
@@ -266,6 +269,7 @@
View,
EditPen,
Search,
+ editRow
};
},
});
--
Gitblit v1.9.2