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/targetDecompositionMonth/index.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/goalManagement/targetDecompositionMonth/index.vue b/src/views/goalManagement/targetDecompositionMonth/index.vue
index 5bf0692..f0510a7 100644
--- a/src/views/goalManagement/targetDecompositionMonth/index.vue
+++ b/src/views/goalManagement/targetDecompositionMonth/index.vue
@@ -24,7 +24,8 @@
<div class="btns">
<div>
<!--<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>-->
- <!-- <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> -->
+ <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain
+ @click="openD('修改', deletAll[0])">修改</el-button>
<el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
</div>
</div>
@@ -40,7 +41,7 @@
<el-table-column align="center" prop="dutyDepartmentName" label="责任部门" />
<el-table-column align="center" prop="value" label="考核指标" />
<el-table-column align="center" prop="makerDepartmentName" label="制定人部门" />
- <el-table-column align="center" prop="makeDate" label="制定日期" />
+ <el-table-column align="center" prop="makeDate" :formatter="timeDate" label="制定日期" />
<el-table-column align="center" prop="commitPersonName" label="上报人" />
</el-table>
</el-tab-pane>
@@ -76,6 +77,7 @@
</div>
</template>
<script lang="ts">
+import { timeDate } from '/@/assets/index.ts';
import search from '../targetSettings/component/search.vue';
import Dailog from '../targetDecompositionYear/component/Dailog.vue';
import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
@@ -226,6 +228,7 @@
listApi()
}
return {
+ timeDate,
add,
listApi,
resetForm,
--
Gitblit v1.9.2