From cefcb88c6cd0690052e503d5f1c943cb7f8a03cb Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 30 十一月 2022 09:18:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
index ec8fdd2..c0a5906 100644
--- a/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
+++ b/src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
@@ -5,8 +5,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="员工姓名" size="default">
- <el-input v-model="form.personId" placeholder="请选择">
- <template #append> <el-button :icon="Search" @click="daiInpts" /> </template
+ <el-input v-model="form.personName" placeholder="请选择">
+ <template #append> <el-button :icon="Search" @click="daiInpts(0)" /> </template
></el-input>
</el-form-item>
</el-col>
@@ -14,31 +14,34 @@
<el-row>
<el-col :span="11">
<el-form-item label="奖惩名称" size="default">
- <el-input v-model="form.rewardPunishmentStandardId" placeholder="请选择">
+ <el-input v-model="form.rewardPunishmentStandardName" 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 disabled v-model="form.personId" />
+ <el-select v-model="form.standardType" disabled size="default" style="width: 100%" placeholder="请选择">
+ <el-option label="奖励" :value="1" />
+ <el-option label="惩罚" :value="2" />
+ </el-select>
</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 disabled v-model="form.personId" placeholder="请填写奖惩内容" />
+ <el-input disabled v-model="form.content" placeholder="请填写奖惩内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="依据" size="default">
- <el-input disabled v-model="form.personId" placeholder="请填写奖惩依据" />
+ <el-input disabled v-model="form.reason" placeholder="请填写奖惩依据" />
</el-form-item>
</el-col>
- </el-row> -->
+ </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注信息">
@@ -50,7 +53,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="resetForm" size="default">关闭</el-button>
- <el-button type="primary" @click="submitForm" size="default">确定</el-button>
+ <el-button type="primary" @click="submitForm" size="default" :disabled="disabled">确定</el-button>
</span>
</template>
</el-dialog>
@@ -70,22 +73,27 @@
const dialogVisible = ref<boolean>(false);
const form = ref({
rewardPunishmentStandardId: '', //奖惩标准/外键
+ rewardPunishmentStandardName: '',
memo: '', ////备注信息
- personId: "", ////员工（多个用逗号隔开）
+ personId: '', ////员工（多个用逗号隔开）
+ personName: '',
});
const titles = ref();
const disabled = ref(false);
// 打开弹窗
- const openDailog = (title: string, value: any, id: number) => {
+ const openDailog = (title: string, value: any, data: any) => {
dialogVisible.value = true;
titles.value = `${title}奖惩标准设定`;
disabled.value = title == '查看' ? true : false;
if (title == '查看' || title == '修改')
goalManagementApi()
- .getrewardPunishmentDetail(id)
+ .getrewardPunishmentDetail(data.id)
.then((res) => {
if (res.data.code == 200) {
form.value = res.data.data;
+ form.value.standardType = data.standardType;
+ form.value.content = data.content;
+ form.value.reason = data.reason;
} else {
ElMessage.error(res.data.msg);
}
@@ -94,6 +102,10 @@
// 提交
const submitForm = () => {
dialogVisible.value = false;
+ delete form.value.standardType;
+ delete form.value.content;
+ delete form.value.reason;
+ delete form.value.rewardPunishmentStandardName
goalManagementApi()
.getrewardPunishmentAddOrUpdate(form.value)
.then((res) => {
@@ -109,8 +121,10 @@
});
form.value = {
rewardPunishmentStandardId: '', //奖惩标准/外键
+ rewardPunishmentStandardName: '',
memo: '', ////备注信息
- personId: "", ////员工（多个用逗号隔开）
+ personId: '', ////员工（多个用逗号隔开）
+ personName: '',
};
};
// 取消
@@ -118,8 +132,10 @@
dialogVisible.value = false;
form.value = {
rewardPunishmentStandardId: '', //奖惩标准/外键
+ rewardPunishmentStandardName: '',
memo: '', ////备注信息
- personId: "", ////员工（多个用逗号隔开）
+ personId: '', ////员工（多个用逗号隔开）
+ personName: '',
};
};
@@ -129,16 +145,27 @@
Shows.value.openDailog();
};
const Show = ref();
- const daiInpts = () => {
- Show.value.openDailog();
+ const daiInpts = (type: any) => {
+ Show.value.openDailog(type);
};
- const numberId=(val:any)=>{
- console.log(val)
- form.value.rewardPunishmentStandardId=val.id
- }
- const UserId=(val:any)=>{
- form.value.personId=val.id
- }
+ const numberId = (val: any) => {
+ console.log(val);
+ form.value.rewardPunishmentStandardId = val.id;
+ form.value.rewardPunishmentStandardName = val.qname;
+ form.value.standardType = val.standardType;
+ form.value.content = val.content;
+ form.value.reason = val.reason;
+ };
+ const UserId = (val: any) => {
+ let arr = [];
+ let arrId = [];
+ for (let i = 0; i < val.length; i++) {
+ arr.push(val[i].realName);
+ arrId.push(val[i].uid);
+ }
+ form.value.personName = arr.toString();
+ form.value.personId = arrId.toString();
+ };
//全屏
const full = ref(false);
const toggleFullscreen = () => {
--
Gitblit v1.9.2