评优任务页面、考核结果页面修改

GuLiMmo

2023-12-15 4b898d43d04242e74157aedafa5e1c7d75d1abcd

评优任务页面、考核结果页面修改

 src/api/assessment/assessmentScore.js

New file
@@ -0,0 +1,13 @@
import request from '@/axios';

export const getList = (current, size, params) => {
    return request({
        url: '/assessment/assessmentScore/list',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

 src/views/assessment/assessmentResults.vue

File was deleted

 src/views/assessment/assessmentTask.vue

@@ -16,7 +16,7 @@
            导出
          </el-button>
        </template>
        <template #menu>
        <template #menu="{row}">
          <el-button type="primary" icon="el-icon-plus" size="small" @click="handleTaskResult(row)">
            考核结果
          </el-button>
@@ -121,6 +121,7 @@
    handleTaskResult(row) {
      this.isResult = false;
      this.resultParams = row
      this.resultParams.type = this.defaultTaskType
    },
    changeIs(is) {
      this.isResult = is

 src/views/assessment/components/taskResult.vue

@@ -5,13 +5,17 @@
                <span>考核结果</span>
            </template>
        </el-page-header>
        <avue-crud ref="crud" v-model="form" v-model:search="search" :option="option" :data="data" v-model:page="page">
        <avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
            :data="data" :permission="permissionList" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
        </avue-crud>
    </div>
</template>
  
<script>

import { getList } from '@/api/assessment/assessmentScore'
export default {
    props: {
        params: {
@@ -23,17 +27,12 @@
    },
    data() {
        return {
            rowData: {},
            form: {},
            query: {},
            search: {},
            selectionList: [],
            data: [
                {
                    assessor: '张三',
                    position: '经理',
                    weight: 50,
                    ratingRange: 50,
                }
            ],
            loading: true,
            data: [],
            option: {
                height: 'auto',
                calcHeight: 32,
@@ -41,25 +40,25 @@
                searchMenuSpan: 6,
                border: true,
                index: true,
                addBtn: true,
                addBtn: false,
                viewBtn: true,
                editBtn: false,
                delBtn: true,
                selection: true,
                delBtn: false,
                selection: false,
                dialogClickModal: false,
                menuWidth: 200,
                column: [
                    {
                        label: "考核编号",
                        type: 'select',
                        hide: true,
                        search: true
                    },
                    // {
                    //     label: "考核编号",
                    //     type: 'select',
                    //     hide: true,
                    //     search: true
                    // },
                    {
                        label: "被考核人",
                        prop: "name",
                        prop: "userName",
                        type: "input",
                        search: true,
                        search: true
                    },
                    {
                        label: "工号",
@@ -75,14 +74,14 @@
                        prop: "postName",
                        type: "input",
                    },
                    {
                        label: "人员类型",
                        prop: "personnelType",
                        type: "input",
                    },
                    // {
                    //     label: "人员类型",
                    //     prop: "personnelType",
                    //     type: "input",
                    // },
                    {
                        label: "考核分",
                        prop: "ratingRange",
                        prop: "scoreVal",
                        type: "input",
                    }
                ]
@@ -95,6 +94,15 @@
        }
    },
    watch: {
        'params': {
            handler(val) {
                this.rowData = val
                this.query.assessmentTaskId = val.id
                this.query.type = val.type
            },
            deep: true,
            immediate: true,
        }
    },
    computed: {
        ids() {
@@ -109,9 +117,143 @@
        back() {
            this.$emit('changeIs', true)
        },
        sizeChange() { },
        refreshChange() { },
        rowSave(row, done, loading) {
            add(row).then(() => {
                this.onLoad(this.page);
                this.$message({
                    type: "success",
                    message: "操作成功!"
                });
                done();
            }, error => {
                loading();
                window.console.log(error);
            });
        },
        rowUpdate(row, index, done, loading) {
            update(row).then(() => {
                this.onLoad(this.page);
                this.$message({
                    type: "success",
                    message: "操作成功!"
                });
                done();
            }, error => {
                loading();
                console.log(error);
            });
        },
        rowDel(row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return remove(row.id);
                })
                .then(() => {
                    this.onLoad(this.page);
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    });
                });
        },
        handleDelete() {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据");
                return;
            }
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return remove(this.ids);
                })
                .then(() => {
                    this.onLoad(this.page);
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    });
                    this.$refs.crud.toggleSelection();
                });
        },
        // handleExport() {
        //     let downloadUrl = `/assessmentTask/assessmentTask/export-assessmentTask?${this.website.tokenHeader}=${getToken()}`;
        //     const {
        //     } = this.query;
        //     let values = {
        //         ...this.query
        //     };
        //     this.$confirm("是否导出数据?", "提示", {
        //         confirmButtonText: "确定",
        //         cancelButtonText: "取消",
        //         type: "warning"
        //     }).then(() => {
        //         NProgress.start();
        //         exportBlob(downloadUrl, values).then(res => {
        //             downloadXls(res.data, `考核任务表${dateNow()}.xlsx`);
        //             NProgress.done();
        //         })
        //     });
        // },
        beforeOpen(done, type) {
            if (["edit", "view"].includes(type)) {
                getDetail(this.form.id).then(res => {
                    this.form = res.data.data;
                });
            }
            done();
        },
        searchReset() {
            this.query = {};
            this.onLoad(this.page);
        },
        searchChange(params, done) {
            params.type = this.defaultTaskType
            this.query = params;
            this.page.currentPage = 1;
            this.onLoad(this.page, params);
            done();
        },
        selectionChange(list) {
            this.selectionList = list;
        },
        selectionClear() {
            this.selectionList = [];
            this.$refs.crud.toggleSelection();
        },
        currentChange(currentPage) {
            this.page.currentPage = currentPage;
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize;
        },
        refreshChange() {
            this.onLoad(this.page, this.query);
        },
        onLoad(page, params = {}) {
            this.loading = true;

            const {
            } = this.query;

            let values = {
                ...this.query,
                ...params
            };

            getList(page.currentPage, page.pageSize, values).then(res => {
                const data = res.data.data;
                this.page.total = data.total;
                this.data = data.records;
                this.loading = false;
                this.selectionClear();
            });
        }
    },
    mounted() {

 src/views/evaluate/components/addDialog.vue

@@ -18,65 +18,33 @@
          </el-select>
        </el-form-item>-->
        <el-form-item label="候选部门:" prop="candidateNum">
          <el-select
            v-model="selectGroup"
            value-key="deptId"
            multiple
            style="width: 100%;"
            placeholder="请选择候选部门"
          >
            <el-option
              v-for="dept in depts"
              :key="dept.deptId"
              :label="dept.deptName"
              :value="dept"
            ></el-option>
                    <el-select v-model="selectGroup" value-key="deptId" multiple style="width: 100%;" placeholder="请选择候选部门">
                        <el-option v-for="dept in depts" :key="dept.deptId" :label="dept.deptName"
                            :value="dept"></el-option>
          </el-select>
          <div class="select-list" v-for="content in selectGroup" :key="content.deptId">
            <span>{{content.deptName}}:</span>
            <el-form-item label="候选人数:" prop="deptnumber" class="select-num">
              <el-input
                type="number"
                :min="1"
                :max="10"
                v-model="addForm.deptnumber"
                placeholder="请输入"
              ></el-input>
            </el-form-item>
            <el-form-item label="参选人:" class="select-item">
              <el-select v-model="content.users" value-key="id" multiple>
                <el-option
                  v-for="employee in content.employees"
                  :key="employee.id"
                  :label="employee.name"
                  :value="employee"
                ></el-option>
                    <div class="select-list">
                        <el-form-item v-for="content in selectGroup" :key="content.deptId" :label="content.deptName"
                            class="select-item">
                            <el-input-number min="1" :max="content.employees.length" v-model="content.val"
                                controls-position="right" placeholder="请输入候选人数量" class="select-num"></el-input-number>
                            <el-select v-model="content.users" value-key="id" multiple placeholder="请输入候选人">
                                <el-option v-for="employee in content.employees" :key="employee.id" :label="employee.name"
                                    :value="employee"></el-option>
              </el-select>
            </el-form-item>
          </div>
        </el-form-item>
        <el-form-item label="候选人截止日期:" prop="candidateCutoffTime">
          <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-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>
        <el-form-item label="评优数量:" prop="evaluateNum">
          <el-input v-model="addForm.evaluateNum" placeholder="请输入评优数量"></el-input>
                    <el-input-number min="1" :max="maxEvaluateNum" v-model="addForm.evaluateNum" controls-position="right"
                        :placeholder="`请输入评优数量（最多不可大于${maxEvaluateNum}人）`" class="evaluateNum-input"></el-input-number>
        </el-form-item>
        <el-form-item label="评优截止日期:" prop="evaluateCutoffTime">
          <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-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>
      </el-form>
    </div>
@@ -137,19 +105,32 @@
        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' }],
                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: 'Please input Activity name', trigger: 'click' }],
                evaluateNum: [
                    { required: true, message: '请输入评优数量', trigger: 'click' }
                ],
        evaluateCutoffTime: [
          { required: true, message: 'Please input Activity name', trigger: 'click' },
                    { required: true, message: '请选择评优截止时间', trigger: 'click' },
        ],
      },
            maxEvaluateNum: 0,
    };
  },
  watch: {
@@ -169,6 +150,7 @@
    selectGroup: {
      handler(val) {
        this.addForm.candidateNum = [];
                this.maxEvaluateNum = 0;
        val.forEach(item => {
          const users = [];
          item.users.forEach(user => {
@@ -177,10 +159,12 @@
              name: user.name,
            });
          });
                    this.maxEvaluateNum += (item.val * 1);
                    console.log(item.val);
          this.addForm.candidateNum.push({
            deptId: item.deptId,
            deptName: item.deptName,
            val: item.users.length,
                        val: item.val,
            users,
          });
        });
@@ -282,25 +266,34 @@

<style lang="scss" scoped>
.content {
  height: 40%;
    max-height: 400px;
  overflow: auto;
}

.select-list {
  width: 100%;
  display: flex;
  align-items: center;
  justify-content: center;
  margin-top: 15px;
  span {
    width: 80px;
  }
  .select-num {
    width: 250px;
  }

  .select-item {
    flex: 1;
    .el-select {
      width: 100%;
            margin-top: 15px;
            display: flex;

            .select-num {
                flex: 2;
            }

            .el-select {
                flex: 5;
                margin-left: 10px;
            }
        }
    }

    .evaluateNum-input {
        width: 100%;
        :deep() {
            .el-input__inner {
                text-align: left;
            }
    }
  }
}