修改

zhouwx

3 天以前 63a02cf53d4722ca3d3260249bf7d6330ebcbe03

修改

 src/assets/images/certBg.jpg

 src/views/work/onlineEducation/offlineEducation/components/recordDialog.vue

@@ -9,45 +9,35 @@
        :close-on-click-modal="false"
    >
      <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="180px" >
        <el-form-item label="企业名称:"  prop="companyName" >
          <el-select
              v-if="state.isAdmin"
              v-model="state.form.companyName"
              style="width: 100%"
              v-loadMoreNew:[reselect]="handleScroll"
              :popper-class="reselect.name"
              @change="selectCompany"
              class="item-width"
          >
        <el-form-item label="企业名称:" v-if="state.isAdmin"  prop="companyId">
          <el-select v-model="state.form.companyId" filterable placeholder="请选择" :disabled="state.title == '查看' || state.title == '编辑' || !state.isAdmin" clearable  @change="selectValueCom"  style="width:100%">
            <el-option
                v-for="item in state.companyList"
                :key="item.id"
                :label="item.name"
                :value="item.name"
            />
                :value="item.id">
            </el-option>
          </el-select>

          <el-input v-else v-model.trim="state.form.companyName" disabled ></el-input>
        </el-form-item>
        <el-form-item label="计划名称:"  prop="planName" >
          <el-input v-model.trim="state.form.planName" placeholder="请输入计划名称"></el-input>
        </el-form-item>
        <el-form-item label="学员:"  prop="studentName" >
        <el-form-item label="学员:"  prop="studentId" >
          <el-select
              v-model="state.form.studentName"
              clearable
              multiple
              collapse-tags
              collapse-tags-tooltip
              v-model="state.students"
              :disabled="state.title =='查看'"
              filterable
              style="width: 100%"
              v-loadMoreNew:[reselectStu]="handleScrollStu"
              :popper-class="reselectStu.name"
              class="m-2"
              @change="selectValue"
              placeholder="请选择学生"
              popper-class="more_select_dropdown"
          >
            <el-option
                v-for="item in state.studentList"
                v-for="item in state.peopleList"
                :key="item.id"
                :label="item.name"
                :value="item.name"
                :value="item.id"
            />
          </el-select>
        </el-form-item>
@@ -68,36 +58,36 @@
          </el-select>
<!--          <el-input v-model.trim="state.form.level" :disabled="disabled" placeholder="请输入培训等级" ></el-input>-->
        </el-form-item>
        <el-form-item label="要求课时（分）:"  prop="period" >
          <el-input v-model.trim="state.form.period"
                    @input="state.form.period = state.form.period
                    .replace(/[^0-9.]/g, '')
                    .replace(/(\..*)\./g, '$1')
                    .replace(/^(-?\d+\.?\d*).*/, '$1')"
                    :disabled="disabled" placeholder="请输入要求课时（分）" ></el-input>
        </el-form-item>
        <el-form-item label="实际课时（分）:"  prop="actualPeriod" >
          <el-input v-model.trim="state.form.actualPeriod"
                    @input="state.form.actualPeriod = state.form.actualPeriod
                    .replace(/[^0-9.]/g, '')
                    .replace(/(\..*)\./g, '$1')
                    .replace(/^(-?\d+\.?\d*).*/, '$1')"
                    :disabled="disabled" placeholder="请输入实际课时（分）" ></el-input>
        </el-form-item>
        <el-form-item label="考试成绩:"  prop="score" >
          <el-input v-model.trim="state.form.score"
                    @input="state.form.score = state.form.score
                    .replace(/[^0-9.]/g, '')
                    .replace(/(\..*)\./g, '$1')
                    .replace(/^(-?\d+\.?\d*).*/, '$1')"
                    :disabled="disabled" placeholder="请输入考试成绩" ></el-input>
        </el-form-item>
        <el-form-item label="是否合格:"  prop="passed" >
          <el-radio-group v-model="state.form.passed"  :disabled="disabled">
            <el-radio :label="0">不合格</el-radio>
            <el-radio :label="1">合格</el-radio>
          </el-radio-group>
        </el-form-item>
<!--        <el-form-item label="要求课时（分）:"  prop="period" >-->
<!--          <el-input v-model.trim="state.form.period"-->
<!--                    @input="state.form.period = state.form.period-->
<!--                    .replace(/[^0-9.]/g, '')-->
<!--                    .replace(/(\..*)\./g, '$1')-->
<!--                    .replace(/^(-?\d+\.?\d*).*/, '$1')"-->
<!--                    :disabled="disabled" placeholder="请输入要求课时（分）" ></el-input>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="实际课时（分）:"  prop="actualPeriod" >-->
<!--          <el-input v-model.trim="state.form.actualPeriod"-->
<!--                    @input="state.form.actualPeriod = state.form.actualPeriod-->
<!--                    .replace(/[^0-9.]/g, '')-->
<!--                    .replace(/(\..*)\./g, '$1')-->
<!--                    .replace(/^(-?\d+\.?\d*).*/, '$1')"-->
<!--                    :disabled="disabled" placeholder="请输入实际课时（分）" ></el-input>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="考试成绩:"  prop="score" >-->
<!--          <el-input v-model.trim="state.form.score"-->
<!--                    @input="state.form.score = state.form.score-->
<!--                    .replace(/[^0-9.]/g, '')-->
<!--                    .replace(/(\..*)\./g, '$1')-->
<!--                    .replace(/^(-?\d+\.?\d*).*/, '$1')"-->
<!--                    :disabled="disabled" placeholder="请输入考试成绩" ></el-input>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="是否合格:"  prop="passed" >-->
<!--          <el-radio-group v-model="state.form.passed"  :disabled="disabled">-->
<!--            <el-radio :label="0">不合格</el-radio>-->
<!--            <el-radio :label="1">合格</el-radio>-->
<!--          </el-radio-group>-->
<!--        </el-form-item>-->
        <el-form-item label="培训记录:"  prop="passed" >
          <el-upload accept=".jpg,.jpeg,.png,.doc,.docx,.pdf,.xls,xlsx,ppt,pptx" style="width: 100%" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip"  v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
            <el-button type="primary">点击上传</el-button>
@@ -131,6 +121,7 @@
import {getCompany} from "@/api/onlineEducation/company";
import {delPic} from "@/api/onlineEducation/banner";
import {getToken} from "@/utils/auth";
import {getUser} from "@/api/onlineEducation/user";

const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -162,13 +153,11 @@

  },
  formRules:{
    companyName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
    companyId: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
    planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
    studentName: [{ required: true, message: '请选择学员', trigger: 'blur' }],
    studentId: [{ required: true, message: '请选择学员', trigger: 'blur' }],
    level: [{ required: true, message: '请输入培训等级', trigger: 'blur' }],
    period: [{ required: true, message: '请输入要求课时（分）', trigger: 'blur' }],
    actualPeriod: [{ required: true, message: '实际课时（分）', trigger: 'blur' }],
    score: [{ required: true, message: '请输入考试成绩', trigger: 'blur' }],
    courseName: [{ required: true, message: '请输入课程名称', trigger: 'blur' }],
  },
  isAdmin: false,
  studentList: [],
@@ -195,6 +184,7 @@
  header: {
    Authorization: getToken()
  },
  students: []

})
onMounted(() => {
@@ -203,22 +193,20 @@

const disabled = ref(false);
const openDialog = async (type, value) => {
  await loadMoreStuData();
  if(state.isAdmin){
    await loadMoreCompanyData();
  }

  const userInfo = JSON.parse(Cookies.get('userInfo'))
  console.log("userInfo",userInfo)
  if(userInfo.userType === 0){
    state.isAdmin = true;
    state.form.userType = 0;
    state.form.companyId = null
   await getCompanyList()
  }else {
    state.isAdmin = false;
    state.form.companyId = userInfo.companyId;
    state.form.companyName = userInfo.companyName;
    state.form.userType = 1;
  }

  state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ;
  if(type === 'edit' || type === 'view') {
    if( type === 'view'){
@@ -226,8 +214,7 @@
    }

    state.form = JSON.parse(JSON.stringify(value))
    state.form.studentId = value.student.id
    state.form.studentName = value.student.name
    state.students = state.form.students.map(i => i.id)
    state.fileList = value.files.map(i => {
      return {
        name: i.fileName,
@@ -240,9 +227,11 @@
  if(type == 'pwd'){
    state.form.id = value.id
  }
  await   getPeopleList()
  dialogVisible.value = true
}
const onSubmit = async () => {
  state.form.studentId = state.students.join(',')
  const valid = await superRef.value.validate();
  if(valid){
    if(state.title == '新增'){
@@ -302,6 +291,7 @@
  state.companyPageSize = 10;
  state.companyList = [];
  state.stuPageNum = 1;
  state.students = []
  state.stuPageSize = 10;
  state.studentList = [];
  state.fileList = []
@@ -327,7 +317,35 @@
}



const getCompanyList = async ()=>{
  const queryParams = {
    pageNum: 1,
    pageSize: 999
  }
  const res = await getCompany(queryParams)
  if (res.code == 200) {
    state.companyList = res.data.list?res.data.list:[]
    // data.queryParams.companyId = data.companyList[0].id
  } else {
    ElMessage.warning(res.message)
  }
}
const getPeopleList = async ()=> {
  if(state.isAdmin && !state.form.companyId && (state.form.companyId == 0 || state.form.companyId == null)){
    return
  }
  const queryParams = {
    pageNum: 1,
    pageSize: 9999,
    companyId: state.form.companyId
  }
  const res = await getStudent(queryParams)
  if(res.code == 200){
    state.peopleList = res.data.list?res.data.list:[]
  }else{
    ElMessage.warning(res.message)
  }
};
const handleScrollStu = () => {
  console.log(' student',state.hasMoreStu);
  if(state.stuPageNum >= state.hasMoreStu) return
@@ -431,6 +449,11 @@
  //   state.form.filePath = ''
  // });
}
const selectValueCom = (val) => {
  state.students = []
  state.form.studentId = null
  getPeopleList()
}


defineExpose({

 src/views/work/onlineEducation/offlineEducation/index.vue

@@ -46,7 +46,10 @@
      <el-table-column label="计划名称" prop="planName" align="center"  />
      <el-table-column label="学员姓名" prop="studentName" align="center">
        <template #default="scope">
          <span>{{scope.row.student.name}}</span>
          <div style="display: flex;flex-wrap: wrap">
            <div v-for="(item,index) in scope.row.students" style="display: flex" >{{item.name}}<div v-if="scope.row.students && index !=scope.row.students.length -1">,</div></div>
          </div>

        </template>
      </el-table-column>
<!--      <el-table-column label="性别" prop="sex" align="center" >-->
@@ -54,25 +57,25 @@
<!--          <span>{{scope.row.sex == 0 ? '男':'女'}}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="身份证号" prop="idNo" align="center" width="200" :show-overflow-tooltip="true">
        <template #default="scope">
          <span>{{scope.row.student.idNo}}</span>
        </template>
      </el-table-column>
<!--      <el-table-column label="身份证号" prop="idNo" align="center" width="200" :show-overflow-tooltip="true">-->
<!--        <template #default="scope">-->
<!--          <span>{{scope.row.student.idNo}}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="课程名称" prop="courseName" align="center"/>
      <el-table-column label="培训等级" prop="level" align="center">
        <template #default="scope">
          <span>{{scope.row.level == 1 ? '公司级':scope.row.level == 2 ? '部门级' : '车间级'}}</span>
        </template>
      </el-table-column>
      <el-table-column label="要求课时（分）" prop="period" align="center"/>
      <el-table-column label="实际课时（分）" prop="actualPeriod" align="center"/>
      <el-table-column label="考试成绩" prop="score" align="center"/>
      <el-table-column label="是否合格" prop="passed" align="center">
        <template #default="scope">
          <span>{{scope.row.passed == 0 ? '不合格':'合格'}}</span>
        </template>
      </el-table-column>
<!--      <el-table-column label="要求课时（分）" prop="period" align="center"/>-->
<!--      <el-table-column label="实际课时（分）" prop="actualPeriod" align="center"/>-->
<!--      <el-table-column label="考试成绩" prop="score" align="center"/>-->
<!--      <el-table-column label="是否合格" prop="passed" align="center">-->
<!--        <template #default="scope">-->
<!--          <span>{{scope.row.passed == 0 ? '不合格':'合格'}}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="培训记录" prop="passed" align="center" width="180">
        <template #default="scope">
          <div v-for="item in scope.row.files" style="display: flex;flex-direction: column">