From 7df64634d3d7b292713eebfa008c40b3f5f9f65f Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 20 九月 2022 15:57:03 +0800
Subject: [PATCH] 修改
---
src/views/goalManagement/targetDecompositionYear/component/Dailog.vue | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
index 04d74fe..c728ad6 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
@@ -33,16 +33,16 @@
</el-form>
<el-tabs v-model="activeName" class="demo-tabs">
<el-tab-pane label="目标指标分解" name="1">
- <el-button type="primary" size="default" @click="daiAdd" :disabled="disabled">新增</el-button>
+ <el-button type="primary" size="default" @click="daiAdd('新增')" :disabled="disabled">新增</el-button>
</el-tab-pane>
</el-tabs>
<el-table :data="formUp.targetDivideDetailList" style="width: 100%">
- <el-table-column align="center" property="dutyDepartmentId" label="责任部门" width="180" />
+ <el-table-column align="center" property="dutyDepartmentName" label="责任部门" width="180" />
<el-table-column align="center" property="value" label="考核指标" width="180" />
- <el-table-column align="center" property="makerDepartmentId" label="制定人部门" />
- <el-table-column align="center" property="makeDate" :formatter="timeDate(makeDate)" label="制定日期" />
- <el-table-column align="center" property="commitPersonId" label="上报人" />
- <el-table-column align="center" property="操作">
+ <el-table-column align="center" property="makerDepartmentName" label="制定人部门" />
+ <el-table-column align="center" property="makeDate" :formatter="timeDate" label="制定日期" />
+ <el-table-column align="center" property="commitPersonName" label="上报人" />
+ <el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="daiAdd('查看', scope.row)">查看</el-button>
<el-button link :disabled="disabled" type="primary" @click="daiAdd('修改', scope.row)">修改</el-button>
@@ -62,22 +62,24 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
+import { timeDate } from '/@/assets/index.ts';
import { Search, FullScreen } from '@element-plus/icons-vue';
import DailogAdd from './DailogAdd.vue';
import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext } from 'element-plus';
import DailogSearch from '../../../../components/DailogSearch/DailogSearch.vue';
import { goalManagementApi } from '/@/api/goalManagement';
import { emit } from 'process';
+import { deepClone } from '/@/utils/other';
export default defineComponent({
components: { DailogAdd, DailogSearch },
- setup(props,{emit}) {
+ setup(props, { emit }) {
const dialogVisible = ref<boolean>(false);
const form = ref({
qName: '',
indexNum: '',
year: '',
value: '',
- targetDivideDetailList:[]
+ targetDivideDetailList: [],
});
const targetType = ref();
const disabled = ref(false);
@@ -93,12 +95,28 @@
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
- formUp.targetDivideDetailList=form.value.targetDivideDetailList
+ formUp.targetDivideDetailList = form.value.targetDivideDetailList;
+ for(let i=0;i<formUp.targetDivideDetailList.length;i++){
+ formUp.targetDivideDetailList[i].makeDate=timeC(formUp.targetDivideDetailList[i].makeDate)
+ }
} else {
ElMessage.error(res.data.msg);
}
});
}
+ };
+ const timeC = (timestamp: any) => {
+ let a = new Date(timestamp).getTime();
+ const date = new Date(a);
+ const Y = date.getFullYear() + '-';
+ const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+ const D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+ const h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+ const m = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+ const s = date.getSeconds(); // 秒
+ const dateString = Y + M + D + h + m +`:${s}`;
+ // console.log('dateString', dateString); // > dateString 2021-07-06 14:23
+ return dateString;
};
const onNumber = (val: object) => {
form.value = val;
@@ -108,9 +126,10 @@
// 表格
const tableData = ref([]);
// 新增弹窗
+ const index = ref<any>();
const Show = ref();
const daiAdd = (title: string, data: any) => {
- console.log(data);
+ index.value = formUp.targetDivideDetailList.indexOf(data);
Show.value.openDailog(title, data);
};
const formUp = reactive({
@@ -118,14 +137,27 @@
delTargetDivideDetails: '', //要删除的目标指标分解ID,多个用逗号隔开
targetDivideDetailList: [], //目标指标分解列表
});
+
const add = (val: any) => {
- formUp.targetDivideDetailList.push(val);
+ const item = deepClone(val);
+ console.log(item)
+ if (index.value == -1) {
+ formUp.targetDivideDetailList.push(item);
+ } else {
+ formUp.targetDivideDetailList[index.value] = item;
+ }
+
// let obj=JSON.parse(JSON.stringify(form.value))
};
// 新增
const submitForm = () => {
- formUp.delTargetDivideDetails=arr.value.toString()
+ formUp.delTargetDivideDetails = arr.value.toString();
formUp.targetId = form.value.id;
+ dialogVisible.value = false;
+ for(let i=0;i<formUp.targetDivideDetailList.length;i++){
+ delete formUp.targetDivideDetailList[i].dutyDepartmentName
+ delete formUp.targetDivideDetailList[i].makerDepartmentName
+ }
goalManagementApi()
.gettargetDivideDetail(formUp)
.then((res) => {
@@ -134,30 +166,29 @@
message: res.data.msg,
type: 'success',
});
- dialogVisible.value = false;
- emit("addList")
+ emit('addList');
} else {
ElMessage.error(res.data.msg);
}
});
- form.value = {
+ form.value = {
qName: '',
indexNum: '',
year: '',
value: '',
- targetDivideDetailList:[]
+ targetDivideDetailList: [],
};
tableData.value = [];
formUp.targetId = '';
formUp.delTargetDivideDetails = '';
formUp.targetDivideDetailList = [];
};
- const arr=ref([])
+ const arr = ref([]);
// 删除
const Delete = (data: any) => {
formUp.targetDivideDetailList.splice(form.value.targetDivideDetailList.indexOf(data), 1);
formUp.targetId = data.targetId;
- arr.value.push(data.id)
+ arr.value.push(data.id);
};
// 安全目标指标弹窗
const Shows = ref();
@@ -172,7 +203,7 @@
indexNum: '',
year: '',
value: '',
- targetDivideDetailList:[]
+ targetDivideDetailList: [],
};
tableData.value = [];
formUp.targetId = '';
@@ -189,14 +220,15 @@
}
};
// 时间格式处理
- const timeDate = (data: any) => {
- console.log('xxxxxxxxxxx',data)
- let result = new Date(data).getTime();
- return result;
- };
+ // const timeDate = (data: any) => {
+ // let result = new Date(data).getTime();
+ // return result;
+ // };
return {
- arr,
+ timeC,
+ index,
timeDate,
+ arr,
form,
dialogVisible,
openDailog,
--
Gitblit v1.9.2