From ae07a87d84ccc7f568d4e3b8ff4b0c68cf43c0b1 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 18 八月 2022 15:27:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

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

diff --git a/src/views/goalManagement/targetSettings/index.vue b/src/views/goalManagement/targetSettings/index.vue
index 0653f49..0086c8e 100644
--- a/src/views/goalManagement/targetSettings/index.vue
+++ b/src/views/goalManagement/targetSettings/index.vue
@@ -35,6 +35,8 @@
 				</div>
 				<el-tab-pane label="目标定制(年)" name="1"> </el-tab-pane>
 				<el-tab-pane label="目标定制(月)" name="2"></el-tab-pane>
+				<el-tab-pane label="目标定制(半年)" name="3"></el-tab-pane>
+				<el-tab-pane label="目标定制(季度)" name="4"></el-tab-pane>
 			</el-tabs>
 			<el-table ref="multipleTableRef" :data="tableData" @selection-change="handleSelectionChange" style="width: 100%">
 				<el-table-column label="序号" align="center" type="index" width="70" />
@@ -44,7 +46,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 +80,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';
@@ -101,6 +104,7 @@
 		const resetForm = () => {
 			ruleForm.searchParams.qName = '';
 			ruleForm.searchParams.indexNum = '';
+			listApi()
 		};
 		const listApi = () => {
 			goalManagementApi()
@@ -153,6 +157,8 @@
 		};
 		// 删除
 		const onDelete = (id: number) => {
+			let arr=[]
+			arr.push(id)
 			ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -160,7 +166,7 @@
 			})
 				.then(() => {
 					goalManagementApi()
-						.getTargetMngDelete(id)
+						.getTargetMngDelete(arr)
 						.then((res) => {
 							if (res.data.code == 200) {
 								ElMessage({
@@ -190,7 +196,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 +242,7 @@
 		// 	upShow.value.openDialog();
 		// };
 		return {
+			timeDate,
 			tableData,
 			currentPage4,
 			pageSize4,

--
Gitblit v1.9.2