Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue

@@ -1,16 +1,18 @@
<!-- 人员能力 -->
<template>
  <div>
    <div style="display: flex;justify-content: space-between;">
      <el-form ref="page" size="small" :inline="true">
        <el-form-item label="姓名">
          <el-input v-model="userName" placeholder="请输入姓名" size="small" clearable></el-input>
        </el-form-item>
        <el-form-item>
          <el-button size="small" type="primary" @click="refreshTable">查 询</el-button>
        </el-form-item>
      </el-form>
      <div>
    <div style="display: flex;justify-content: space-between">
      <div style="display: flex;">
        <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
          <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">姓名</span>
          <el-input size="small" placeholder="请输入" clearable v-model="userName"
                    @keyup.enter.native="refreshTable"></el-input>
        </div>
        <div style="line-height: 30px;">
          <el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
        </div>
      </div>
      <div style="line-height: 30px;">
        <el-button v-if="!isDepartment" size="small" type="primary" @click="addAppointPost('add')">新增</el-button>
      </div>
    </div>
@@ -181,13 +183,24 @@
            </el-radio-group>
          </el-form-item>
        </el-col>
        <el-col :span="24">
        <el-col :span="12">
          <el-form-item prop="confirmOperatingPersonnelId" label="确认人：">
            <el-select v-model="form.confirmOperatingPersonnelId" clearable :disabled="operationType === 'view' || operationType === 'confirm'"
                       filterable size="small" style="width: 50%;">
                       filterable size="small">
              <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item prop="confirmDate" label="确认时间：">
            <el-date-picker v-model="form.confirmDate"
                            format="yyyy-MM-dd"
                            :disabled="operationType === 'view' || operationType === 'confirm'"
                            placeholder="选择日期"
                            size="small"
                            value-format="yyyy-MM-dd HH:mm:ss"
                            type="date"></el-date-picker>
          </el-form-item>
        </el-col>
      </el-form>
@@ -250,33 +263,33 @@
        {
          label: '岗位',
          prop: 'postName',
          minWidth: '100'
          width: '100'
        }, {
          label: '姓名',
          prop: 'userName',
          minWidth: '100'
          width: '100'
        }, {
          label: '学历',
          prop: 'academicDegree',
          minWidth: '100'
          width: '100'
        }, {
          label: '专业',
          prop: 'major',
          minWidth: '100'
          width: '100'
        }, {
          label: '职称',
          prop: 'professionalTitle',
          minWidth: '100'
          width: '100'
        }, {
          dataType: 'slot',
          label: '岗位职责',
          prop: 'jobResponsibilities',
          minWidth: '200px',
          width: '400',
          slot: 'jobResponsibilities'
        }, {
          dataType: 'tag',
          label: '综合评价',
          minWidth: '140px',
          width: '140px',
          prop: 'comprehensiveAssessment',
          formatData: (params) => {
            if (params == 'Qualified this position') {
@@ -299,14 +312,13 @@
        }, {
          label: '确认人',
          prop: 'confirmOperatingPersonnelName',
          minWidth: '100'
          width: '100'
        }, {
          label: '确认日期',
          prop: 'confirmDate',
          minWidth: '160'
          width: '160'
        }, {
          dataType: 'action',
          minWidth: '220',
          label: '操作',
          fixed: 'right',
          operation: [
@@ -378,6 +390,7 @@
      responsibleOptions: [],
      rules: {
        confirmOperatingPersonnelId: [{ required: true, message: '请选择确认人', trigger: 'change' }],
        confirmDate: [{ required: true, message: '请选择确认时间', trigger: 'change' }],
        userId: [{ required: true, message: '请选择人员', trigger: 'change' }],
        academicDegree: [{ required: true, message: '请输入学历查核结果', trigger: 'blur' }],
        academicConformNot: [{ required: true, message: '请选择学历符合与否', trigger: 'change' }],
@@ -543,7 +556,7 @@
      this.dialogVisible = false;
    },
    getUserList(){
      selectUserCondition().then(res => {
      selectUserCondition({type: 2}).then(res => {
        if (res.code == 200) {
          this.responsibleOptions = res.data
        }