From 5460b437791f7ea31a720f24a3dafc0bf5952f71 Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期二, 09 八月 2022 09:44:45 +0800
Subject: [PATCH] 目标指标分解(年)二级弹框回填问题

---
 src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue |    6 +++---
 src/views/goalManagement/targetDecompositionYear/component/Dailog.vue    |   12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
index 8960533..1dd0819 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
@@ -40,7 +40,7 @@
 			<el-table-column align="center" property="dutyDepartmentId" 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" label="制定日期" :formatter="timeDate"/>
+			<el-table-column align="center" property="makeDate" label="制定日期" />
 			<el-table-column align="center" property="commitPersonName" label="上报人" />
 			<el-table-column align="center" property="操作">
 				<template #default="scope">
@@ -69,6 +69,7 @@
 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}) {
@@ -120,11 +121,16 @@
 			delTargetDivideDetails: '', //要删除的目标指标分解ID,多个用逗号隔开
 			targetDivideDetailList: [], //目标指标分解列表
 		});
+
+
+
+
 		const add = (val: any) => {
+			const item = deepClone(val)
             if(index.value==-1){
-				formUp.targetDivideDetailList.push(val);
+				formUp.targetDivideDetailList.push(item);
 			}else{
-				formUp.targetDivideDetailList[index.value] = val;
+				formUp.targetDivideDetailList[index.value] = item;
 			}
 			
 			// let obj=JSON.parse(JSON.stringify(form.value))
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index 9786b4e..bebc315 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable @close="resetForm(ruleFormRef)">
 		<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
 		<el-form :model="form" :disabled="disabled" label-width="120px" ref="ruleFormRef" :rules="rules">
 			<el-row>
@@ -22,7 +22,7 @@
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="制定日期" prop="makeDate" size="default">
-						<el-date-picker v-model="form.makeDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
+						<el-date-picker v-model="form.makeDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -168,7 +168,7 @@
 			// console.log(formEl);
 			if (!formEl) return
 			formEl.resetFields();
-			// dialogVisible.value = false;
+			dialogVisible.value = false;
 		};
 		// const handleClose = (formEl: any) => {
 		// 	formEl.resetFields();

--
Gitblit v1.9.2