From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

---
 src/views/goalManagement/targetSettings/index.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/goalManagement/targetSettings/index.vue b/src/views/goalManagement/targetSettings/index.vue
index 0653f49..63a96fc 100644
--- a/src/views/goalManagement/targetSettings/index.vue
+++ b/src/views/goalManagement/targetSettings/index.vue
@@ -44,7 +44,7 @@
 				<el-table-column property="year" label="年度" align="center" sortable show-overflow-tooltip />
 				<el-table-column property="value" label="指标值" align="center" sortable show-overflow-tooltip />
 				<el-table-column property="level" label="指标级别" align="center" sortable show-overflow-tooltip />
-				<el-table-column property="completeDate" label="完成期限" align="center" sortable show-overflow-tooltip />
+				<el-table-column property="completeDate" label="完成期限" align="center" :formatter="timeDate" sortable show-overflow-tooltip />
 				<el-table-column label="状态" align="center" sortable show-overflow-tooltip>
 					<template #default="scope">
 						<span v-if="scope.row.divideStatus == 1">已分解</span>
@@ -78,6 +78,7 @@
 </template>
 <script lang="ts">
 import dailogAdd from './component/dailogAdd.vue';
+import {timeDate} from '/@/assets/index.ts'
 import upData from '../../../components/updata/updata.vue';
 import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus';
@@ -153,6 +154,8 @@
 		};
 		// 删除
 		const onDelete = (id: number) => {
+			let arr=[]
+			arr.push(id)
 			ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -160,7 +163,7 @@
 			})
 				.then(() => {
 					goalManagementApi()
-						.getTargetMngDelete(id)
+						.getTargetMngDelete(arr)
 						.then((res) => {
 							if (res.data.code == 200) {
 								ElMessage({
@@ -190,7 +193,7 @@
 			for (let i = 0; i < valId.length; i++) {
 				arr.push(valId[i].id);
 			}
-			deletAll.value = arr.toString();
+			deletAll.value = arr
 			if (val.length == 1) {
 				// warning.value = false;
 				danger.value = false;
@@ -236,6 +239,7 @@
 		// 	upShow.value.openDialog();
 		// };
 		return {
+			timeDate,
 			tableData,
 			currentPage4,
 			pageSize4,

--
Gitblit v1.9.2