From aa9ed4ac9790b3512572f40b66d44b68f2b0c1aa Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 03 八月 2022 15:45:17 +0800
Subject: [PATCH] 对接

---
 src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue |  131 +++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index 1c862ac..6b04990 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -1,11 +1,11 @@
 <template>
-	<el-dialog v-model="dialogVisible" :fullscreen="full" title="新建目标指标分解" width="50%" draggable>
+	<el-dialog v-model="dialogVisible" :fullscreen="full" title="新建目标指标分解"  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>
 				<el-col :span="11">
 					<el-form-item label="责任部门" prop="dutyDepartmentId" size="default">
-						<el-tree-select v-model="form.dutyDepartmentId" :data="data" class="w100" :props="propse" placeholder="请选择" />
+						<el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" :data="data" class="w100" :props="propse" placeholder="请选择" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
@@ -17,7 +17,7 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="制定人部门" prop="makerDepartmentId" size="default">
-						<el-tree-select v-model="form.makerDepartmentId" :data="data" class="w100" :props="propse" placeholder="请选择" />
+						<el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="11" :offset="2">
@@ -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 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>
@@ -64,7 +64,65 @@
 			value: '', ////考核指标值
 			makeDate: '', ////制定日期
 		});
-		const ruleFormRef = ref<FormInstance>();
+		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()
+				.getTreedepartment()
+				.then((res) => {
+					if (res.data.code == 200) {
+						data.value = res.data.data;
+					} else {
+						ElMessage.error(res.data.msg);
+					}
+				});
+		};
+		const propse = {
+			label: 'depName',
+			children: 'children',
+			value: 'depId',
+		};
+		onMounted(() => {
+			department();
+		});
+		const disabled = ref(false);
+		// 开启弹窗
+		const dialogVisible = ref(false);
+		const openDailog = (title: string, data: any) => {
+			if (title == '查看') {
+				disabled.value = true;
+				form.value = data;
+			} else if (title == '修改') {
+				disabled.value = false;
+				form.value = data;
+			} else {
+				disabled.value = false;
+			}
+			dialogVisible.value = true;
+		};
+		// 开启用户弹窗
+		const Show = ref();
+		const openUser = () => {
+			Show.value.openDailog();
+		};
+				const ruleFormRef = ref<FormInstance>();
 		const rules = reactive<FormRules>({
 			dutyDepartmentId: [
 				{
@@ -102,65 +160,6 @@
 				},
 			],
 		});
-		const submitForm = async (formEl: FormInstance | undefined) => {
-			if (!formEl) return;
-			await formEl.validate((valid, fields) => {
-				if (valid) {
-					dialogVisible.value = false;
-					emit('onAdd', form.value);
-				} else {
-					console.log('error submit!', fields);
-				}
-			});
-			formEl.resetFields();
-		};
-
-		const resetForm = (formEl: FormInstance | undefined) => {
-			if (!formEl) return;
-			formEl.resetFields();
-			dialogVisible.value = false;
-		};
-		//部门
-		const department = () => {
-			goalManagementApi()
-				.getTreedepartment()
-				.then((res) => {
-					if (res.data.code == 200) {
-						data.value = res.data.data;
-					} else {
-						ElMessage.error(res.data.msg);
-					}
-				});
-		};
-		const propse = {
-			label: 'depName',
-			children: 'children',
-			value:"depId"
-		};
-		onMounted(() => {
-			
-		});
-		const disabled=ref(false)
-		// 开启弹窗
-		const dialogVisible = ref(false);
-		const openDailog = (title:string,data:any) => {
-			department();
-			if(title=='查看'){
-				disabled.value=true
-				form.value=data
-			}else if(title=='修改'){
-				disabled.value=true
-				disabled.value=false
-			}else{
-				disabled.value=false
-			}
-			dialogVisible.value = true;
-		};
-		// 开启用户弹窗
-		const Show = ref();
-		const openUser = () => {
-			Show.value.openDailog();
-		};
 		//全屏
 		const full = ref(false);
 		const toggleFullscreen = () => {
@@ -171,10 +170,10 @@
 			}
 		};
 		const data = ref();
-		const nameC=ref()
+		const nameC = ref();
 		const onUser = (e: any) => {
 			form.value.commitPersonId = e.uid;
-			nameC.value=e.realName
+			nameC.value = e.realName;
 		};
 		return {
 			disabled,

--
Gitblit v1.9.2