From f60473bc01862ba1e289e7764f9478b9675e9c68 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期五, 05 八月 2022 09:23:56 +0800
Subject: [PATCH] 对接

---
 src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue |   73 +++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index 6b04990..b74644b 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="新建目标指标分解"  width="50%" draggable>
+	<el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
 		<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>
@@ -10,7 +10,7 @@
 				</el-col>
 				<el-col :span="11" :offset="2">
 					<el-form-item label="考核指标" prop="value" size="default">
-						<el-input v-model="form.value" />
+						<el-input v-model.number="form.value" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -28,8 +28,8 @@
 			</el-row>
 			<el-row>
 				<el-col :span="11">
-					<el-form-item label="上报人" prop="commitPersonId" size="default">
-						<el-input v-model="nameC">
+					<el-form-item label="上报人" prop="commitPersonName" size="default">
+						<el-input v-model="form.commitPersonName">
 							<template #append> <el-button :icon="Search" @click="openUser" /> </template
 						></el-input>
 					</el-form-item>
@@ -39,7 +39,7 @@
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
+				
 				<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
 				<el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
 			</span>
@@ -57,31 +57,15 @@
 export default defineComponent({
 	components: { DailogSearchUser },
 	setup(props, { emit }) {
+		const ruleFormRef = ref<FormInstance>()
 		const form = ref({
 			dutyDepartmentId: '', ////责任部门/外键
 			makerDepartmentId: '', ////制定人部门/外键
 			commitPersonId: '', ////上报人/外键
+			commitPersonName: '',
 			value: '', ////考核指标值
 			makeDate: '', ////制定日期
 		});
-		const submitForm = async (formEl: FormInstance | undefined) => {
-			if (!formEl) return;
-			await formEl.validate((valid, fields) => {
-				if (valid) {
-					dialogVisible.value = false;
-					emit('onAdd', form.value);
-					// formEl.resetFields();
-				} else {
-					console.log('error submit!', fields);
-				}
-			});
-		};
-
-		const resetForm = (formEl: FormInstance | undefined) => {
-			dialogVisible.value = false;
-			if (!formEl) return 
-			formEl.resetFields();
-		};
 		//部门
 		const department = () => {
 			goalManagementApi()
@@ -104,8 +88,10 @@
 		});
 		const disabled = ref(false);
 		// 开启弹窗
+		const titles = ref();
 		const dialogVisible = ref(false);
 		const openDailog = (title: string, data: any) => {
+			titles.value = `${title}目标指标分解`;
 			if (title == '查看') {
 				disabled.value = true;
 				form.value = data;
@@ -122,7 +108,6 @@
 		const openUser = () => {
 			Show.value.openDailog();
 		};
-				const ruleFormRef = ref<FormInstance>();
 		const rules = reactive<FormRules>({
 			dutyDepartmentId: [
 				{
@@ -142,24 +127,52 @@
 				{
 					required: true,
 					message: '上报人不能为空',
-					trigger: 'change',
+					trigger: 'blur',
 				},
 			],
 			value: [
 				{
 					required: true,
 					message: '考核指标值不能为空',
-					trigger: 'change',
+					trigger: 'blur',
+				},
+				{
+					type: 'number',
+					message: '考核指标值只能为数字类型',
+					trigger: 'blur',
 				},
 			],
 			makeDate: [
 				{
 					required: true,
 					message: '制定日期不能为空',
-					trigger: 'change',
+					trigger: 'blur',
 				},
 			],
+			commitPersonName: [],
 		});
+		const submitForm = async (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			await formEl.validate((valid, fields) => {
+				if (valid) {
+					emit('onAdd', form.value);
+					dialogVisible.value = false;
+					// handleClose(formEl)
+				} else {
+					console.log('error submit!', fields);
+				}
+			});
+		};
+
+		const resetForm = (formEl: FormInstance | undefined) => {
+			// console.log(formEl);
+			if (!formEl) return
+			formEl.resetFields();
+			// dialogVisible.value = false;
+		};
+		// const handleClose = (formEl: any) => {
+		// 	formEl.resetFields();
+		// };
 		//全屏
 		const full = ref(false);
 		const toggleFullscreen = () => {
@@ -170,14 +183,14 @@
 			}
 		};
 		const data = ref();
-		const nameC = ref();
 		const onUser = (e: any) => {
 			form.value.commitPersonId = e.uid;
-			nameC.value = e.realName;
+			form.value.commitPersonName = e.realName;
 		};
 		return {
 			disabled,
-			nameC,
+			titles,
+			// handleClose,
 			form,
 			propse,
 			department,

--
Gitblit v1.9.2