GuLiMmo
2023-12-15 cf0fd03556e2953958968a75786800e7970dd2df
考核权重新增修改、考核任务状态新增
3 files modified
47 ■■■■■ changed files
src/option/assessmentTask/assessmentTask.js 17 ●●●● patch | view | raw | blame | history
src/views/assessment/assessmentTask.vue 5 ●●●● patch | view | raw | blame | history
src/views/assessment/components/assessmentWeight.vue 25 ●●●● patch | view | raw | blame | history
src/option/assessmentTask/assessmentTask.js
@@ -5,7 +5,7 @@
  searchShow: true,
  searchMenuSpan: 6,
  border: true,
  index: true,
  index: false,
  viewBtn: false,
  delBtn: false,
  editBtn: false,
@@ -29,6 +29,7 @@
      prop: "assessmentNo",
      type: "input",
      search: true,
      width: 100,
      rules: [
        {
          required: true,
@@ -41,6 +42,7 @@
      label: "考核目的",
      prop: "assessmentPurpose",
      type: "input",
      width: 100,
      rules: [
        {
          required: true,
@@ -53,6 +55,7 @@
      label: "考核类型",
      prop: "type",
      type: "select",
      width: 100,
      disabled: true,
      formatter: (res) => {
        return res.type === 0? '个人考核' : '部门考核';
@@ -82,6 +85,7 @@
      type: "date",
      format: "YYYY-MM-DD HH:mm:ss",
      valueFormat: "YYYY-MM-DD HH:mm:ss",
      width: 200,
      rules: [
        {
          required: true,
@@ -96,6 +100,7 @@
      type: "date",
      format: "YYYY-MM-DD HH:mm:ss",
      valueFormat: "YYYY-MM-DD HH:mm:ss",
      width: 200,
      rules: [
        {
          required: true,
@@ -107,8 +112,14 @@
    {
      label: "备注",
      prop: "remark",
      type: "textarea",
      span: 24,
      type: "textarea"
    },
    {
      label: "任务状态",
      prop: "isAssessmentOk",
      type: "input",
      width: 100,
      slot: true
    },
    // {
    //   label: "创建人",
src/views/assessment/assessmentTask.vue
@@ -7,6 +7,9 @@
        @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">
        <template #isAssessmentOk="{ row }">
          <el-tag :type="row.isAssessmentOk ? 'success' : ''" effect="dark">{{ row.isAssessmentOk ? '已完成' : '进行中' }}</el-tag>
        </template>
        <template #menu-left>
          <el-button type="danger" icon="el-icon-delete" plain v-if="permission.assessmentTask_delete"
            @click="handleDelete">
@@ -16,7 +19,7 @@
            导出
          </el-button>
        </template>
        <template #menu="{row}">
        <template #menu="{ row }">
          <el-button type="primary" icon="el-icon-plus" size="small" @click="handleTaskResult(row)">
            考核结果
          </el-button>
src/views/assessment/components/assessmentWeight.vue
@@ -180,21 +180,22 @@
        back() {
            this.$emit('changeIs', true)
        },
        rowSave(row, done, loading) {
        async rowSave(row, done, loading) {
            !this.params.isDept ? row.userId = this.params.id : row.deptId = this.params.id
            const toUser = this.selectList.find(option => row.toUserName === option.name)
            const toUser = this.selectList.find(option => option.name === row.toUserName)
            row.toUserId = toUser.id
                (this.params.isDept ? addDept(row) : add(row)).then(() => {
                    this.onLoad(this.page);
                    this.$message({
                        type: "success",
                        message: "操作成功!"
                    });
                    done();
                }, error => {
                    loading();
                    window.console.log(error);
            console.log(row);
            (this.params.isDept ? addDept(row) : add(row)).then(() => {
                this.onLoad(this.page);
                this.$message({
                    type: "success",
                    message: "操作成功!"
                });
                done();
            }, error => {
                loading();
                window.console.log(error);
            });
        },
        rowUpdate(row, index, done, loading) {
            console.log(row);