From d88c7daf794f41761d9d952280ae47d036b2bae8 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 28 七月 2022 14:08:58 +0800
Subject: [PATCH] 对接

---
 src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue |   51 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
index cb66dc1..ec8fdd2 100644
--- a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
+++ b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
@@ -5,7 +5,7 @@
 			<el-row>
 				<el-col :span="24">
 					<el-form-item label="员工姓名" size="default">
-						<el-input v-model="form.name" placeholder="请选择">
+						<el-input v-model="form.personId" placeholder="请选择">
 							<template #append> <el-button :icon="Search" @click="daiInpts" /> </template
 						></el-input>
 					</el-form-item>
@@ -14,35 +14,35 @@
 			<el-row>
 				<el-col :span="11">
 					<el-form-item label="奖惩名称" size="default">
-						<el-input v-model="form.name" placeholder="请选择">
+						<el-input v-model="form.rewardPunishmentStandardId" placeholder="请选择">
 							<template #append> <el-button :icon="Search" @click="daiInpt" /> </template
 						></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="11" :offset="2">
+				<!-- <el-col :span="11" :offset="2">
 					<el-form-item label="奖惩类型" size="default">
-						<el-input v-model="form.name" />
+						<el-input disabled v-model="form.personId" />
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 			</el-row>
-			<el-row>
+			<!-- <el-row>
 				<el-col :span="24">
 					<el-form-item label="奖惩内容" size="default">
-						<el-input v-model="form.name" placeholder="请填写奖惩内容" />
+						<el-input disabled v-model="form.personId" placeholder="请填写奖惩内容" />
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="24">
 					<el-form-item label="依据" size="default">
-						<el-input v-model="form.name" placeholder="请填写奖惩依据" />
+						<el-input disabled v-model="form.personId" placeholder="请填写奖惩依据" />
 					</el-form-item>
 				</el-col>
-			</el-row>
+			</el-row> -->
 			<el-row>
 				<el-col :span="24">
 					<el-form-item label="备注信息">
-						<el-input v-model="form.name" type="textarea" />
+						<el-input v-model="form.memo" type="textarea" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -54,8 +54,8 @@
 			</span>
 		</template>
 	</el-dialog>
-	<DailogSearchUser ref="Show"></DailogSearchUser>
-	<DailogSearch ref="Shows"></DailogSearch>
+	<DailogSearchUser ref="Show" @SearchUser="UserId"></DailogSearchUser>
+	<DailogSearch ref="Shows" @backNum="numberId"></DailogSearch>
 </template>
 <script lang="ts">
 import { defineComponent, ref, reactive } from 'vue';
@@ -66,9 +66,13 @@
 import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext } from 'element-plus';
 export default defineComponent({
 	components: { DailogSearch, DailogSearchUser },
-	setup(props,{emit}) {
+	setup(props, { emit }) {
 		const dialogVisible = ref<boolean>(false);
-		const form = ref({});
+		const form = ref({
+			rewardPunishmentStandardId: '', //奖惩标准/外键
+			memo: '', ////备注信息
+			personId: "", ////员工(多个用逗号隔开)
+		});
 		const titles = ref();
 		const disabled = ref(false);
 		// 打开弹窗
@@ -104,14 +108,18 @@
 					}
 				});
 			form.value = {
-		
-			}
+				rewardPunishmentStandardId: '', //奖惩标准/外键
+				memo: '', ////备注信息
+				personId: "", ////员工(多个用逗号隔开)
+			};
 		};
 		//   取消
 		const resetForm = () => {
 			dialogVisible.value = false;
 			form.value = {
-				
+				rewardPunishmentStandardId: '', //奖惩标准/外键
+				memo: '', ////备注信息
+				personId: "", ////员工(多个用逗号隔开)
 			};
 		};
 
@@ -124,6 +132,13 @@
 		const daiInpts = () => {
 			Show.value.openDailog();
 		};
+		const numberId=(val:any)=>{
+			console.log(val)
+			form.value.rewardPunishmentStandardId=val.id
+		}
+		const UserId=(val:any)=>{
+			form.value.personId=val.id
+		}
 		//全屏
 		const full = ref(false);
 		const toggleFullscreen = () => {
@@ -135,11 +150,13 @@
 		};
 		return {
 			dialogVisible,
+			UserId,
 			form,
 			titles,
 			disabled,
 			openDailog,
 			submitForm,
+			numberId,
 			resetForm,
 			Shows,
 			daiInpt,

--
Gitblit v1.9.2