GuLiMmo
2023-12-28 cb2a139d5be99339a5e3f00bdf812793b12b29a4
考核任务、评优任务页面更新
3 files modified
3 files added
734 ■■■■■ changed files
src/views/assessment/assessmentTask.vue 5 ●●●● patch | view | raw | blame | history
src/views/assessment/components/addTaskDialog.vue 71 ●●●●● patch | view | raw | blame | history
src/views/evaluate/components/addDialog copy.vue 407 ●●●●● patch | view | raw | blame | history
src/views/evaluate/components/addDialog.vue 175 ●●●●● patch | view | raw | blame | history
src/views/evaluate/components/referrerPopover.vue 2 ●●● patch | view | raw | blame | history
src/views/evaluate/components/setAssessor.vue 74 ●●●●● patch | view | raw | blame | history
src/views/assessment/assessmentTask.vue
@@ -29,6 +29,7 @@
    <template v-else>
      <taskResult :params="resultParams" @changeIs="changeIs" />
    </template>
    <!-- <addTaskDialog /> -->
  </basic-container>
</template>
@@ -43,10 +44,12 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import taskResult from './components/taskResult.vue'
import addTaskDialog from "./components/addTaskDialog.vue";
export default {
  components: {
    taskResult
    taskResult,
    addTaskDialog
  },
  data() {
    return {
src/views/assessment/components/addTaskDialog.vue
New file
@@ -0,0 +1,71 @@
<template>
    <el-dialog v-model="props.visible" title="新增考核任务">
        <el-form :model="taskForm" label-width="100px">
            <el-row>
                <el-col :span="12">
                    <el-form-item label="考核编号:">
                        <el-input placeholder="请输入考核编号"></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="考核种类">
                        <el-select style="width: 100%;" placeholder="请选择考核种类"></el-select>
                    </el-form-item>
                </el-col>
            </el-row>
            <el-row>
                <el-col :span="12">
                    <el-form-item label="开始时间:">
                        <el-date-picker v-model="taskForm.startTime" type="data" placeholder="请选择开始时间"
                            format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="结束时间:">
                        <el-date-picker v-model="taskForm.endTime" type="data" placeholder="请选择结束时间"
                            format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                    </el-form-item>
                </el-col>
            </el-row>
            <el-row>
                <el-input v-model="taskForm" type="textarea" :rows="4" placeholder=""></el-input>
            </el-row>
            <el-row>
            </el-row>
        </el-form>
    </el-dialog>
</template>
<script setup>
import { reactive } from 'vue';
const props = defineProps({
    visible: {
        type: Boolean,
        default: true
    }
})
const taskForm = reactive({
    assessmentNo: '',
    assessmentPurpose: '',
    startTime: '',
    endTime: '',
    remark: ''
})
const taskRules = {
    assessmentNo: [
        { required: true, message: '请输入考核编号', trigger: 'blur' }
    ],
    assessmentPurpose: [
        { required: true, message: '请选择考核种类', trigger: 'blur' }
    ],
    startTime: [
        { required: true, message: '请选择开始时间', trigger: 'blur' }
    ]
}
</script>
<style lang="scss" scoped></style>
src/views/evaluate/components/addDialog copy.vue
New file
@@ -0,0 +1,407 @@
<template>
    <el-dialog v-model="params.visible" :title="params.title" width="70%" destroy-on-close @close="dialogClose">
        <div class="content">
            <el-form :model="addForm" label-width="170px" :rules="rules" ref="addFormRef">
                <el-form-item label="任务名称:" prop="taskName">
                    <el-input v-model="addForm.taskName" placeholder="请输入任务名称"></el-input>
                </el-form-item>
                <el-form-item label="任务类别:" prop="taskType">
                    <el-input v-model="addForm.taskType" placeholder="请输入任务类别"></el-input>
                </el-form-item>
                <el-form-item label="认定标准描述:" prop="remark">
                    <el-input type="textarea" v-model="addForm.remark" placeholder="请输入认定标准描述"></el-input>
                </el-form-item>
                <!-- <el-form-item label="评优类型:" prop="type">
                    <el-select disabled v-model="addForm.type" placeholder="请选择评优类型" style="width: 100%;">
                        <el-option label="个人评优" value="0" />
                        <el-option label="部门评优" value="1" />
                    </el-select>
                </el-form-item> -->
                <el-form-item :label="params.type ? '评定人:' : '候选部门:'" prop="candidateNum">
                    <el-select v-model="selectGroup" value-key="deptId" multiple style="width: 100%;" placeholder="请选择候选部门"
                        collapse-tags collapse-tags-tooltip :max-collapse-tags="4">
                        <el-option v-for="dept in depts" :key="dept.deptId"
                            :label="dept.employees.length === 0 ? (dept.deptName + '(当前部门下员工人数为0)') : dept.deptName"
                            :value="dept" :disabled="dept.employees.length === 0"></el-option>
                    </el-select>
                    <div class="select-list">
                        <el-form-item label-width="130px" v-for="content in selectGroup" :key="content.deptId"
                            :label="content.deptName" required class="select-item">
                            <span v-if="!params.type">
                                <el-input-number min="0" :max="content.employees.length || Infinity" v-model="content.val"
                                    controls-position="right" placeholder="请输入候选人数量" class="select-num"></el-input-number>
                            </span>
                            <el-select v-model="content.users" value-key="id" multiple collapse-tags collapse-tags-tooltip
                                :max-collapse-tags="4" :placeholder="params.type ? '请选择评定人' : '请选择候选人'">
                                <div class="allSelected">
                                    <el-checkbox @change="handleEmployeeChange($event, content)">全选</el-checkbox>
                                </div>
                                <el-option v-for="employee in content.employees" :key="employee.id" :label="employee.name"
                                    :value="employee"></el-option>
                            </el-select>
                            <el-button type="primary" @click="assessorDialog(content)" v-if="!params.type">设置评选人</el-button>
                        </el-form-item>
                    </div>
                </el-form-item>
                <el-form-item :label="`${params.type ? '评优截止日期' : '第一次评优截止日期'}`" prop="candidateCutoffTime">
                    <el-date-picker v-model="addForm.candidateCutoffTime" type="datetimerange" placeholder="请选择截止时间"
                        start-placeholder="请选择开始时间" end-placeholder="请选择结束时间" format="YYYY-MM-DD HH:mm:ss"
                        valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                </el-form-item>
                <el-form-item label="评优数量:" prop="evaluateNum">
                    <el-input-number min="0" :max="(params.type ? false : maxEvaluateNum) || Infinity"
                        v-model="addForm.evaluateNum" controls-position="right"
                        :placeholder="`请输入评优数量${params.type ? '' : '(最多可选' + maxEvaluateNum + '人)'}`"
                        class="evaluateNum-input"></el-input-number>
                </el-form-item>
                <el-form-item label="是否需要进行二次评优:" prop="isAgain" v-if="!params.type">
                    <el-radio-group v-model="addForm.isAgain">
                        <el-radio :label='1'>是</el-radio>
                        <el-radio :label='0'>否</el-radio>
                    </el-radio-group>
                </el-form-item>
                <el-form-item :label="`${params.type ? '评优截止日期:' : '第二次评优截止日期:'}`" prop="evaluateCutoffTime" v-if="addForm.isAgain">
                    <el-date-picker v-model="addForm.evaluateCutoffTime" type="datetimerange" start-placeholder="请选择开始时间"
                        end-placeholder="请选择结束时间" format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
                        style="width: 100%;" />
                </el-form-item>
            </el-form>
        </div>
        <template #footer>
            <span class="dialog-footer">
                <el-button @click="params.visible = false">取消</el-button>
                <el-button type="primary" @click="submitOrEdit">确认</el-button>
            </span>
        </template>
    </el-dialog>
    <set-assessor :params="assessorDialogParams"></set-assessor>
</template>
<script>
import website from '@/config/website';
import { getDeptTree } from '@/api/system/dept';
import { add, update } from '@/api/evaluate/evaluateTask';
import { getList } from '@/api/system/user.js';
import _ from 'lodash';
import setAssessor from './setAssessor.vue';
export default {
    components: {
        setAssessor
    },
    props: {
        params: {
            type: Object,
            default: () => {
                return {
                    visible: false,
                    title: '新增',
                    isEdit: false,
                    type: 0,
                    addForm: {},
                };
            },
        },
    },
    data() {
        return {
            depts: [],
            selectGroup: [],
            addForm: {
                id: '',
                tenantId: '',
                taskName: '',
                taskType: '',
                remark: '',
                type: '',
                candidateNum: [],
                candidateCutoffTime: '',
                candidateCutoffTimeStart: '',
                candidateCutoffTimeEnd: '',
                evaluateCutoffTimeStart: '',
                evaluateCutoffTimeEnd: '',
                candidateState: '',
                evaluateNum: '',
                evaluateCutoffTime: '',
                evaluateState: '',
                isAgain: null,
                createUser: '',
                createDept: '',
                createTime: '',
                updateUser: '',
                updateTime: '',
                status: '',
                isDeleted: '',
            },
            rules: {
                taskName: [
                    { required: true, message: '请输入任务名称', trigger: 'blur' }
                ],
                taskType: [
                    { required: true, message: '请输入任务类别', trigger: 'blur' }
                ],
                remark: [
                    { required: true, message: '请输入认定标准描述', trigger: 'blur' }
                ],
                type: [
                    { required: true, message: '请选择评优类型', trigger: 'blur' }
                ],
                candidateNum: [
                    { required: true, message: '请选择候选人', trigger: 'click' }
                ],
                candidateCutoffTime: [
                    { required: true, message: '请选择候选人截止日期', trigger: 'click' },
                ],
                evaluateNum: [
                    { required: true, message: '请输入评优数量', trigger: 'click' }
                ],
                isAgain: [
                    { required: true, message: '请选择是否进行二次评优', trigger: 'click' }
                ],
                evaluateCutoffTime: [
                    { required: true, message: '请选择评优截止时间', trigger: 'click' },
                ],
            },
            maxEvaluateNum: 0,
            assessorDialogParams: {
                visible: false,
                data: []
            }
        };
    },
    watch: {
        'params.visible': {
            handler(val) {
                val && this.initData(website.tenantId);
                this.addForm = this.params.addForm;
                val && (this.addForm.type = this.params.type + '')
                if (this.params.isEdit) {
                    this.addForm = this.params.addForm;
                    this.addForm.type = this.params.type + '';
                }
            },
            deep: true,
            immediate: true,
        },
        selectGroup: {
            handler(val) {
                this.addForm.candidateNum = [];
                this.maxEvaluateNum = 0;
                val.forEach(item => {
                    const users = [];
                    item.users.forEach(user => {
                        users.push({
                            id: user.id,
                            name: user.name,
                        });
                    });
                    if (!this.params.type) {
                        this.maxEvaluateNum += (item.val * 1);
                    } else {
                        this.maxEvaluateNum += item.users.length;
                    }
                    this.addForm.candidateNum.push({
                        deptId: item.deptId,
                        deptName: item.deptName,
                        val: this.params.type ? item.users.length : item.val,
                        users,
                    });
                });
            },
            deep: true,
        },
    },
    methods: {
        submitOrEdit() {
            const { candidateNum } = this.addForm
            const isExist = candidateNum.find(item => item.val === void 0 || item.val === 0 || item.users.length === 0)
            candidateNum.forEach(candidate => {
                if (candidate.val > candidate.users.length) {
                    candidate.val = candidate.users.length
                }
            })
            if (isExist) {
                this.$message.warning(`${isExist.deptName}候选人人数不可为空或者0`)
            } else {
                Object.keys(this.addForm).forEach(key => {
                    if (['evaluateCutoffTime', 'candidateCutoffTime'].includes(key)) {
                        const [ start, end ] = this.addForm[key]
                        if (key === 'candidateCutoffTime') {
                            this.addForm.candidateCutoffTimeStart = start
                            this.addForm.candidateCutoffTimeEnd = end
                        } else if (this.addForm.isAgain) {
                            this.addForm.evaluateCutoffTimeStart = start
                            this.addForm.evaluateCutoffTimeEnd = end
                        }
                    }
                })
                this.params.isEdit ? this.handleEdit() : this.handleSubmit()
            }
        },
        handleSubmit() {
            this.$refs.addFormRef.validate(valid => {
                this.params.type && (this.addForm.evaluateState = 1)
                valid && add(this.addForm).then(
                    () => {
                        this.$message({
                            type: 'success',
                            message: '操作成功!',
                        });
                        this.refreshTable();
                    },
                    () => {
                        this.$message({
                            type: 'error',
                            message: '操作失败!',
                        });
                    }
                );
            });
        },
        handleEdit() {
            this.$refs.addFormRef.validate(valid => {
                valid && update(this.addForm).then(
                    () => {
                        this.$message({
                            type: 'success',
                            message: '操作成功!',
                        });
                        this.refreshTable();
                    },
                    error => {
                        this.$message({
                            type: 'error',
                            message: error,
                        });
                    }
                );
            });
        },
        refreshTable() {
            this.$emit('refreshTable', {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            });
            this.params.visible = false;
        },
        async initData(tenantId) {
            const deptTreeRes = await getDeptTree(tenantId)
            let deptList = []
            const cloneDeptTreeRes = _.cloneDeep(deptTreeRes.data.data)
            // 扁平化deptTree
            cloneDeptTreeRes.forEach(item => {
                deptList.push(item);
                if (item.children) {
                    item.children.forEach(ic => {
                        ic.title = item.title + '/' + ic.title;
                    })
                    deptList = deptList.concat(item.children);
                    delete item.children;
                }
            })
            const depts_list = _.cloneDeep(deptList)
            this.depts = []
            for (const dept of depts_list) {
                const employeeRes = await getList(1, 99999, { userType: 2 }, dept.id)
                const { records } = employeeRes.data.data
                this.depts.push({
                    deptId: dept.id,
                    deptName: dept.title,
                    users: [],
                    employees: records
                });
            }
            const params = _.cloneDeep(this.params.addForm.candidateNum) || []
            const newParams = params.map(item => {
                const value = this.depts.find(dept => item.deptId === dept.deptId);
                item.employees = value?.employees || [];
                return item
            })
            let defaultUsers = []
            newParams.forEach(item => {
                const users = item.users.filter(user => item.employees.find(employee => employee.id === user.id))
                // 判断当前item.users和users的区别
                defaultUsers = item.users.filter(iUser => !users.includes(iUser))
                // 改变为修改后的users
                item.users = users
            })
            const resParams = newParams.filter(item => item.employees.length > 0 && item.users.length > 0)
            this.selectGroup = resParams
            // 是否有修改的user, 有的话去修改
            defaultUsers.length > 0 && update(this.addForm)
        },
        handleEmployeeChange(val, content) {
            if (val) {
                content.users = []
                content.employees.forEach(item => {
                    content.users.push({
                        id: item.id,
                        name: item.name
                    })
                })
            } else {
                content.users = []
            }
        },
        dialogClose() {
            this.selectGroup = []
            this.$refs.addFormRef.resetFields()
        },
        assessorDialog(value) {
            if (value.users.length == 0) {
                return this.$message.warning('请选择候选人')
            }
            this.assessorDialogParams = {
                visible: true,
                data: value
            }
        }
    },
};
</script>
<style lang="scss" scoped>
.content {
    max-height: 400px;
    overflow: auto;
    .select-list {
        width: 100%;
        .select-item {
            width: 100%;
            margin-top: 15px;
            display: flex;
            .select-num {
                flex: 2;
            }
            .el-select {
                flex: 5;
                margin-left: 10px;
            }
            .el-button {
                margin-left: 10px;
            }
        }
    }
    .evaluateNum-input {
        width: 100%;
        :deep() {
            .el-input__inner {
                text-align: left;
            }
        }
    }
}
.allSelected {
    padding: 0 20px;
    border-bottom: 1px solid #dcdcdc;
}
</style>
src/views/evaluate/components/addDialog.vue
@@ -1,7 +1,7 @@
<template>
    <el-dialog v-model="params.visible" :rules="rules" :title="params.title" width="60%" destroy-on-close>
    <el-dialog v-model="params.visible" :title="params.title" width="70%" destroy-on-close @close="dialogClose">
        <div class="content">
            <el-form :model="addForm" label-width="130px" :rules="rules" ref="addFormRef">
            <el-form :model="addForm" label-width="170px" :rules="rules" ref="addFormRef">
                <el-form-item label="任务名称:" prop="taskName">
                    <el-input v-model="addForm.taskName" placeholder="请输入任务名称"></el-input>
                </el-form-item>
@@ -9,50 +9,65 @@
                    <el-input v-model="addForm.taskType" placeholder="请输入任务类别"></el-input>
                </el-form-item>
                <el-form-item label="认定标准描述:" prop="remark">
                    <el-input v-model="addForm.remark" placeholder="请输入认定标准描述"></el-input>
                    <el-input type="textarea" v-model="addForm.remark" placeholder="请输入认定标准描述"></el-input>
                </el-form-item>
                <!-- <el-form-item label="评优类型:" prop="type">
                    <el-select disabled v-model="addForm.type" placeholder="请选择评优类型" style="width: 100%;">
                        <el-option label="个人评优" value="0" />
                        <el-option label="部门评优" value="1" />
                    </el-select>
                </el-form-item> -->
                <el-form-item :label="params.type ? '评定人:' : '候选部门:'" prop="candidateNum">
                    <el-select v-model="selectGroup" value-key="deptId" multiple style="width: 100%;" placeholder="请选择候选部门">
                    <el-select :disabled="!addForm.taskName" v-model="selectGroup" value-key="deptId" multiple style="width: 100%;" placeholder="请选择候选部门"
                        collapse-tags collapse-tags-tooltip :max-collapse-tags="4">
                        <el-option v-for="dept in depts" :key="dept.deptId"
                            :label="dept.employees.length === 0 ? (dept.deptName + '(当前部门下员工人数为0)') : dept.deptName"
                            :value="dept" :disabled="dept.employees.length === 0"></el-option>
                    </el-select>
                    <div class="select-list">
                        <el-form-item v-for="content in selectGroup" :key="content.deptId" :label="content.deptName"
                            class="select-item">
                            <span v-if="!params.type">
                                <el-input-number min="0" :max="content.employees.length || Infinity" v-model="content.val"
                                    controls-position="right" placeholder="请输入候选人数量" class="select-num"></el-input-number>
                            </span>
                            <el-select v-model="content.users" value-key="id" multiple
                                :placeholder="params.type ? '请选择评定人' : '请输入候选人'">
                                <div class="allSelected">
                                    <el-checkbox @change="handleEmployeeChange($event, content)">全选</el-checkbox>
                                </div>
                                <el-option v-for="employee in content.employees" :key="employee.id" :label="employee.name"
                                    :value="employee"></el-option>
                            </el-select>
                        </el-form-item>
                        <div v-if="!addForm.taskName">
                            <el-alert title="请先填写任务名称" type="warning" style="margin-top: 15px;" />
                        </div>
                        <div v-else>
                            <el-form-item label-width="130px" v-for="content in selectGroup" :key="content.deptId"
                                :label="content.deptName" required class="select-item">
                                <span v-if="!params.type">
                                    <el-input-number min="0" :max="content.employees.length || Infinity"
                                        v-model="content.val" controls-position="right" placeholder="请输入候选人数量"
                                        class="select-num"></el-input-number>
                                </span>
                                <el-select v-model="content.users" value-key="id" multiple collapse-tags
                                    collapse-tags-tooltip :max-collapse-tags="4"
                                    :placeholder="params.type ? '请选择评定人' : '请选择候选人'">
                                    <div class="allSelected">
                                        <el-checkbox @change="handleEmployeeChange($event, content)">全选</el-checkbox>
                                    </div>
                                    <el-option v-for="employee in content.employees" :key="employee.id"
                                        :label="employee.name" :value="employee"></el-option>
                                </el-select>
                                <el-button type="primary" @click="assessorDialog(content)"
                                    v-if="!params.type">设置评选人</el-button>
                            </el-form-item>
                        </div>
                    </div>
                </el-form-item>
                <el-form-item label="候选人截止日期:" prop="candidateCutoffTime" v-if="!params.type">
                    <el-date-picker v-model="addForm.candidateCutoffTime" type="datetime" placeholder="请选择截止时间"
                        format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                <el-form-item :label="`${params.type ? '评优截止日期' : '第一次评优截止日期'}`" prop="candidateCutoffTime">
                    <el-date-picker v-model="addForm.candidateCutoffTime" type="datetimerange" placeholder="请选择截止时间"
                        start-placeholder="请选择开始时间" end-placeholder="请选择结束时间" format="YYYY-MM-DD HH:mm:ss"
                        valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                </el-form-item>
                <el-form-item label="评优数量:" prop="evaluateNum">
                    <el-input-number min="0" :max="(params.type? false : maxEvaluateNum) || Infinity" v-model="addForm.evaluateNum"
                        controls-position="right" :placeholder="`请输入评优数量${ params.type? '' : '(最多可选' + maxEvaluateNum + '人)' }`"
                    <el-input-number min="0" :max="(params.type ? false : maxEvaluateNum) || Infinity"
                        v-model="addForm.evaluateNum" controls-position="right"
                        :placeholder="`请输入评优数量${params.type ? '' : '(最多可选' + maxEvaluateNum + '人)'}`"
                        class="evaluateNum-input"></el-input-number>
                </el-form-item>
                <el-form-item label="评优截止日期:" prop="evaluateCutoffTime" v-if="params.type">
                    <el-date-picker v-model="addForm.evaluateCutoffTime" type="datetime" placeholder="请选择截止时间"
                        format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
                <el-form-item label="是否需要进行二次评优:" prop="isAgain" v-if="!params.type">
                    <el-radio-group v-model="addForm.isAgain">
                        <el-radio :label='1'>是</el-radio>
                        <el-radio :label='0'>否</el-radio>
                    </el-radio-group>
                </el-form-item>
                <el-form-item :label="`${params.type ? '评优截止日期:' : '第二次评优截止日期:'}`" prop="evaluateCutoffTime"
                    v-if="addForm.isAgain">
                    <el-date-picker v-model="addForm.evaluateCutoffTime" type="datetimerange" start-placeholder="请选择开始时间"
                        end-placeholder="请选择结束时间" format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
                        style="width: 100%;" />
                </el-form-item>
            </el-form>
        </div>
@@ -63,6 +78,7 @@
            </span>
        </template>
    </el-dialog>
    <set-assessor :params="assessorDialogParams"></set-assessor>
</template>
<script>
@@ -71,8 +87,12 @@
import { add, update } from '@/api/evaluate/evaluateTask';
import { getList } from '@/api/system/user.js';
import _ from 'lodash';
import setAssessor from './setAssessor.vue';
export default {
    components: {
        setAssessor
    },
    props: {
        params: {
            type: Object,
@@ -82,6 +102,7 @@
                    title: '新增',
                    isEdit: false,
                    type: 0,
                    taskData: {},
                    addForm: {},
                };
            },
@@ -98,12 +119,17 @@
                taskType: '',
                remark: '',
                type: '',
                candidateNum: [],
                candidateNum: 0,
                candidateCutoffTime: '',
                candidateCutoffTimeStart: '',
                candidateCutoffTimeEnd: '',
                evaluateCutoffTimeStart: '',
                evaluateCutoffTimeEnd: '',
                candidateState: '',
                evaluateNum: '',
                evaluateCutoffTime: '',
                evaluateState: '',
                isAgain: null,
                createUser: '',
                createDept: '',
                createTime: '',
@@ -134,11 +160,18 @@
                evaluateNum: [
                    { required: true, message: '请输入评优数量', trigger: 'click' }
                ],
                isAgain: [
                    { required: true, message: '请选择是否进行二次评优', trigger: 'click' }
                ],
                evaluateCutoffTime: [
                    { required: true, message: '请选择评优截止时间', trigger: 'click' },
                ],
            },
            maxEvaluateNum: 0,
            assessorDialogParams: {
                visible: false,
                data: []
            }
        };
    },
    watch: {
@@ -157,27 +190,27 @@
        },
        selectGroup: {
            handler(val) {
                this.addForm.candidateNum = [];
                this.maxEvaluateNum = 0;
                // this.addForm.candidateNum = 0;
                // this.addForm.candidateEntities = []
                val.forEach(item => {
                    const users = [];
                    item.users.forEach(user => {
                        users.push({
                            id: user.id,
                            name: user.name,
                        });
                    });
                    if (!this.params.type) {
                        this.maxEvaluateNum += (item.val * 1);
                    } else {
                        this.maxEvaluateNum += item.users.length;
                    }
                    this.addForm.candidateNum.push({
                        deptId: item.deptId,
                        deptName: item.deptName,
                        val: this.params.type ? item.users.length : item.val,
                        users,
                    });
                    //     const candidates = []
                    //     item.users.forEach(user => {
                    //         users.push({
                    //             id: user.id,
                    //             name: user.name,
                    //         });
                    //     });
                    // if (!this.params.type) {
                    //     this.maxEvaluateNum += (item.val * 1);
                    // } else {
                    //     this.maxEvaluateNum += item.users.length;
                    // }
                    // this.addForm.candidateNum.push({
                    //     deptId: item.deptId,
                    //     deptName: item.deptName,
                    //     val: this.params.type ? item.users.length : item.val,
                    //     users,
                    // });
                });
            },
            deep: true,
@@ -195,13 +228,25 @@
            if (isExist) {
                this.$message.warning(`${isExist.deptName}候选人人数不可为空或者0`)
            } else {
                Object.keys(this.addForm).forEach(key => {
                    if (['evaluateCutoffTime', 'candidateCutoffTime'].includes(key)) {
                        const [start, end] = this.addForm[key]
                        if (key === 'candidateCutoffTime') {
                            this.addForm.candidateCutoffTimeStart = start
                            this.addForm.candidateCutoffTimeEnd = end
                        } else if (this.addForm.isAgain) {
                            this.addForm.evaluateCutoffTimeStart = start
                            this.addForm.evaluateCutoffTimeEnd = end
                        }
                    }
                })
                this.params.isEdit ? this.handleEdit() : this.handleSubmit()
            }
        },
        handleSubmit() {
            this.$refs.addFormRef.validate(valid => {
                this.params.type && (this.addForm.evaluateState = 1)
                add(this.addForm).then(
                valid && add(this.addForm).then(
                    () => {
                        this.$message({
                            type: 'success',
@@ -220,7 +265,7 @@
        },
        handleEdit() {
            this.$refs.addFormRef.validate(valid => {
                update(this.addForm).then(
                valid && update(this.addForm).then(
                    () => {
                        this.$message({
                            type: 'success',
@@ -292,6 +337,7 @@
            defaultUsers.length > 0 && update(this.addForm)
        },
        handleEmployeeChange(val, content) {
            console.log(this.params);
            if (val) {
                content.users = []
                content.employees.forEach(item => {
@@ -302,6 +348,19 @@
                })
            } else {
                content.users = []
            }
        },
        dialogClose() {
            this.selectGroup = []
            this.$refs.addFormRef.resetFields()
        },
        assessorDialog(value) {
            if (value.users.length == 0) {
                return this.$message.warning('请选择候选人')
            }
            this.assessorDialogParams = {
                visible: true,
                data: value
            }
        }
    },
@@ -329,6 +388,10 @@
                flex: 5;
                margin-left: 10px;
            }
            .el-button {
                margin-left: 10px;
            }
        }
    }
src/views/evaluate/components/referrerPopover.vue
@@ -9,7 +9,7 @@
</template>
<script setup>
import { reactive, readonly } from 'vue';
import { reactive } from 'vue';
import { getReferrer } from '@/api/evaluate/evaluateResult'
import _ from 'lodash'
src/views/evaluate/components/setAssessor.vue
New file
@@ -0,0 +1,74 @@
<template>
    <el-dialog v-model="props.params.visible" title="评定人设置" width="50%" destroy-on-close>
        <avue-crud :data="table.data" :option="option">
            <template #menu="{ row }">
                <el-button type="primary" text icon="el-icon-plus">添加评定人</el-button>
            </template>
        </avue-crud>
    </el-dialog>
</template>
<script setup>
import { markRaw, reactive, watch } from 'vue';
const props = defineProps({
    params: {
        type: Object,
        default: () => {
            return {
                visible: false,
                data: []
            }
        },
    }
})
const table = reactive({
    data: [],
})
const option = markRaw({
    height: '300',
    calcHeight: 30,
    tip: false,
    searchShow: true,
    searchMenuSpan: 6,
    border: true,
    index: true,
    viewBtn: false,
    addBtn: false,
    editBtn: false,
    delBtn: false,
    selection: false,
    dialogClickModal: false,
    menuWidth: 130,
    header: false,
    column: [
        {
            label: "姓名",
            prop: 'name',
            type: 'input',
            width: 100
        },
        {
            label: '评定人',
            type: 'input'
        }
    ]
})
const initTableData = (data) => {
    const { users } = data
    table.data = users
}
watch(() => props.params.visible, (val) => {
    val && initTableData(props.params.data)
}, {
    deep: true,
    immediate: true
})
</script>
<style lang="scss" scoped></style>