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/TargetBook/component/DailogSearch.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/goalManagement/TargetBook/component/DailogSearch.vue b/src/views/goalManagement/TargetBook/component/DailogSearch.vue
index 1801078..79aa042 100644
--- a/src/views/goalManagement/TargetBook/component/DailogSearch.vue
+++ b/src/views/goalManagement/TargetBook/component/DailogSearch.vue
@@ -24,11 +24,11 @@
</el-row>
</el-form>
<el-button size="default" :icon="Delete">清除选择</el-button>
- <el-table :data="tableData" style="width: 100%; margin-top: 20px" @cell-click="radio">
- <el-table-column align="center">
+ <el-table :data="tableData" style="width: 100%; margin-top: 20px" >
+ <el-table-column align="center" width="70px">
<template #default="scope">
<el-radio-group v-model="radio1">
- <el-radio :label="scope.row.id" size="large">{{ null }}</el-radio>
+ <el-radio :label="scope.row.id" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
</el-radio-group>
</template>
</el-table-column>
@@ -59,7 +59,7 @@
:disable-transitions="false"
@close="handleClose(tag)"
>
- {{ tag.id }}
+ {{ tag.date }}
</el-tag>
</div>
</el-col>
@@ -89,24 +89,24 @@
// 表格
const tableData = [
{ id:1,
- date: '2016-05-03',
+ date: '岗位1',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
id:2,
- date: '2016-05-02',
+ date: '岗位2',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
- {
- id:3,
- date: '2016-05-04',
+ {
+ id:3,
+ date: '岗位3',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{ id:4,
- date: '2016-05-01',
+ date: '岗位4',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
--
Gitblit v1.9.2