hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-22 01:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2024-11-22 18:13:32 +08:00
parent ad64f71b38
commit fa05be699c
8 changed files with 294 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/template/内部授课记录导入模板.xlsx
View File

Binary file not shown.

BIN
public/template/讲师费导入模板.xlsx
View File

Binary file not shown.

77
src/components/project/BatchLecturer.vue
View File

@@ -16,7 +16,7 @@
</div>
<div class="content">
<div class="box">
<div style="margin-bottom: 20px;font-size: 18px;font-weight: 700;">选择讲师费汇总:<span style="color:red;margin-left:20px;">{{levelPay||0}}元</span></div>
<div style="margin-bottom: 20px;font-size: 18px;font-weight: 700;">选择讲师费汇总:<span style="color:red;margin-left:20px;">{{payableExpense||0}}元</span></div>
<div class="table">
<a-table
:columns="columns"
@@ -86,14 +86,14 @@ const addList = (item) => {
selectedRowKeys.value.push(item.id)
selectsData.value.push(item)
}
const levelPay = ref(0)
const payableExpense = ref(0)
watch(()=>selectsData.value.length,(val)=>{
if(val){
levelPay.value = selectsData.value.reduce((a,b)=>{
return a + b.levelPay
payableExpense.value = selectsData.value.reduce((a,b)=>{
return a + b.payableExpense
},0)
}else{
levelPay.value = 0
payableExpense.value = 0
}
})
const removeList = (item) => {
@@ -115,35 +115,51 @@ const columns = [
},
{
title: '所属组织',
dataIndex: 'name',
key: 'name',
dataIndex: 'orgName',
key: 'orgName',
align: 'center',
},
{
title: '讲师体系',
dataIndex: 'name',
key: 'name',
dataIndex: 'tsystemName',
key: 'tsystemName',
align: 'center',
},
{
title: '讲师等级',
dataIndex: 'name',
key: 'name',
dataIndex: 'tlevelName',
key: 'tlevelName',
align: 'center',
},
{
title: '发薪地',
dataIndex: 'name',
key: 'name',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
align: 'center',
},
{
title: '课程类型',
dataIndex: 'name',
key: 'name',
dataIndex: 'courseType',
key: 'courseType',
align: 'center',
customRender: ({ text,record })=>{
switch (text) {
case 0:
return "在线课"
case 1:
return "面授课"
case 2:
return "课程开发"
case 3:
return "作业员入模培训"
case 4:
return "其他"
default:
return "-"
}
}
},
{
title: '课程名称',
@@ -153,44 +169,47 @@ const columns = [
},
{
title: '授课/开发课程日期',
dataIndex: 'name',
key: 'name',
dataIndex: 'teachingDate',
key: 'teachingDate',
align: 'center',
},
{
title: '授课/开发课程时长',
dataIndex: 'name',
key: 'name',
dataIndex: 'teachingTime',
key: 'teachingTime',
align: 'center',
customRender: ({ text,record })=>{
return (text/60).toFixed(2)+'小时'
}
},
{
title: '参训人数',
dataIndex: 'name',
key: 'name',
dataIndex: 'studys',
key: 'studys',
align: 'center',
},
{
title: '评分',
dataIndex: 'name',
key: 'name',
dataIndex: 'score',
key: 'score',
align: 'center',
},
{
title: '课酬基准',
dataIndex: 'name',
key: 'name',
dataIndex: 'levelPay',
key: 'levelPay',
align: 'center',
},
{
title: '计划费用',
dataIndex: 'name',
key: 'name',
dataIndex: 'expense',
key: 'expense',
align: 'center',
},
{
title: '应发费用',
dataIndex: 'name',
key: 'name',
dataIndex: 'payableExpense',
key: 'payableExpense',
align: 'center',
},
{

40
src/components/project/ConfirmLecturer.vue
View File

@@ -4,6 +4,7 @@
class="drawerStyle RouterFaceStus"
placement="right"
width="60%"
:zIndex="1001"
>
<div class="drawerMains">
<div class="headers">
@@ -23,14 +24,14 @@
</div>
<div class="right">
<div class="org" :title="item?.trainOrgName">{{item?.trainOrgName}}</div>
<div class="text">{{item?.summaryTotal}}</div>
<div class="text org" :title="item?.summaryTotal">{{item?.summaryTotal}}</div>
</div>
</div>
</div>
<div class="box">
<div class="top">
<div class="item">
<a-input style="border-radius: 8px;width:240px;height: 40px;" v-model:value="nameUserNo" placeholder="请输入工号/讲师名称进行搜索" allowClear />
<a-input @pressEnter="searchData(true)" style="border-radius: 8px;width:240px;height: 40px;" v-model:value="nameUserNo" placeholder="请输入工号/讲师名称进行搜索" allowClear />
</div>
<div class="item">
<a-range-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" style="border-radius: 8px;width:360px;height: 40px;" v-model:value="dateValue" />
@@ -148,6 +149,11 @@ const handleConfirm = () => {
close()
closeDrawer()
})
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
close()
closeDrawer()
})
}
const forData = ref()
@@ -186,6 +192,9 @@ watch(()=>props.visible,(val)=>{
}
})
const removeId = (e,i) =>{
dialog({
content: "是否确认移除",
ok: () =>{
forData.value?.forEach(item=>{
item.expenseList?.some((i,l)=>{
if(i.id == e.id){
@@ -199,6 +208,9 @@ const removeId = (e,i) =>{
}else{
expenseList.value = expenseList.value.filter(item=>item.id !== e.id)
}
forData.value[indexList.value].summaryTotal = forData.value[indexList.value]?.summaryTotal - e.payableExpense
}
})
}
const nameUserNo = ref(null)
const dateValue = ref(null)
@@ -244,15 +256,15 @@ const columns = [
},
{
title: '所属组织',
dataIndex: 'name',
key: 'name',
dataIndex: 'orgName',
key: 'orgName',
align: 'center',
},
{
title: '讲师体系',
dataIndex: 'name',
key: 'name',
dataIndex: 'tsystemName',
key: 'tsystemName',
align: 'center',
},
{
@@ -276,15 +288,15 @@ const columns = [
customRender: ({ text,record })=>{
switch (text) {
case 0:
return "在线"
return "在线课"
case 1:
return "面授"
return "面授课"
case 2:
return "授课"
case 3:
return "课程开发"
case 3:
return "作业员入模培训"
case 4:
return "作业员如模培训"
return "其他"
default:
return "-"
}
@@ -307,6 +319,9 @@ const columns = [
dataIndex: 'teachingTime',
key: 'teachingTime',
align: 'center',
customRender: ({ text,record })=>{
return (text/60).toFixed(2)+'小时'
}
},
{
title: '参训人数',
@@ -528,6 +543,7 @@ const config = () => {
margin-bottom: 20px;
.left{
width: 35%;
min-width: 86px;
text-align:right;
margin-right:30px;
color: rgba(116, 120, 141, 0.603921568627451);
@@ -538,7 +554,7 @@ const config = () => {
.right{
color: #646C9A;
.org{
max-width: 180px;
max-width: 148px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;

10
src/views/lecturer/InsideLecturer.vue
View File

@@ -17,7 +17,7 @@
</a-form-item>
<!-- <div @click="handlesearchlevel"> -->
<a-form-item class="select" >
<a-select style="width: 276px" v-model:value="searchParam.tLevelId" placeholder="请选择讲师级别" allowClear
<a-select style="width: 276px" v-model:value="searchParam.tLevelName" placeholder="请选择讲师级别" allowClear
:options="getLevelList" >
<!-- :disabled="getLevelList.length !== 0 ? false : true" 禁用状态 -->
</a-select>
@@ -473,7 +473,7 @@ export default {
// pageSize1: "10",
name: null,
tsystemName: null,
tLevelId: null,
tLevelName: null,
waitStatus: null,
certStatus: null,
courses: null,
@@ -646,7 +646,7 @@ export default {
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
value: value.levelName,
label: value.levelName,
};
array.push(obj);
@@ -868,7 +868,7 @@ export default {
userNo: null,
newdepartId: null,
tsystemName: null,
tlevelId: null,
tLevelName: null,
waitStatus: null,
certStatus: null,
salaryName: null,
@@ -1267,7 +1267,7 @@ export default {
//导出功能
const handleExport = () => {
window.open(
`${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tsystemId=${state.searchParam.tsystemId ? state.searchParam.tsystemId : ""}&tLevelId=${state.searchParam.tLevelId ? state.searchParam.tLevelId : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
`${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacher?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tsystemId=${state.searchParam.tsystemId ? state.searchParam.tsystemId : ""}&tLevelName=${state.searchParam.tLevelName ? state.searchParam.tLevelName : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
);
// this.download('lesson_records/export', {
// ...state.searchParam

148
src/views/lecturer/LecturerAPPEdit.vue
View File

@@ -31,7 +31,7 @@
<div class="desc">
<div class="input_box">
<div class="input">
<a-input style="height:40px;border-radius:8px;" v-model:value="params.userNoName" placeholder="请输入工号/讲师名称进行搜索" allowClear />
<a-input @pressEnter="search" style="height:40px;border-radius:8px;" v-model:value="params.userNoName" placeholder="请输入工号/讲师名称进行搜索" allowClear />
</div>
<div class="input">
<a-range-picker style="height:40px;border-radius:8px;" @change="dateChange" valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="dateValue" />
@@ -205,18 +205,17 @@
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="评分" name="score">
<a-input class="draitem" v-model:value="formParam.score" placeholder="请输入评分"
@blur="clearscoreNumber" allowClear
showSearch >
</a-input>
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="10" :controls="false" :min="0" :precision="2" placeholder="请输入评分"
allowClear >
</a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="课酬基准" name="levelPay">
<a-input v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）"
@blur="clearlevelPayNumber"
<a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2"
@change="clearlevelPayNumber"
allowClear showSearch class="draitem">
</a-input>
</a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -231,9 +230,9 @@
</a-col>
<a-col :span="12">
<a-form-item label="应发费用" name="payableExpense">
<a-input @blur="payExpense" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" allowClear showSearch>
</a-input>
<a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" allowClear>
</a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -448,8 +447,10 @@ export default {
});
}
const clearlevelPayNumber = () => {
state.formParam.levelPay = state.formParam?.levelPay.replace(/\D/g, '');
state.formParam.expense = state.formParam?.levelPay*state.formParam?.teachingTime
// state.formParam.levelPay = state.formParam?.levelPay.replace(/\D/g, '');
// state.formParam.expense = state.formParam?.levelPay*state.formParam?.teachingTime
state.formParam.levelPay == 0 && (state.formParam.levelPay = null);
state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
}
const clearscoreNumber= () => {
state.formParam.score = state.formParam?.score?.replace(/\D/g, '');
@@ -515,6 +516,13 @@ export default {
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
state.formParam.tsystemName = state.tSystemNames.systemName
state.formParam.tsystemId = state.tSystemNames.systemId
state.formParam.courseName = state.formParam.courseName?.trim()
if(state.formParam.score){
state.formParam.score = String(state.formParam.score)
}
if(state.formParam.levelPay){
state.formParam.levelPay = String(state.formParam.levelPay)
}
const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]);
@@ -529,7 +537,7 @@ export default {
message.success("编辑成功");
state.teacherdialog = false;
cancel()
getTableDate();
search();
}).catch(err=>{
message.destroy()
state.teacherdialog = false;
@@ -639,6 +647,7 @@ export default {
state.teachingDate = dayjs(res.data.data.teachingDate)
state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
state.formParam.orgNames = state.formParam.orgName
state.formParam.teachingDate = dayjs(state.formParam.teachingDate).format("YYYY-MM-DD HH:mm")
}).catch((err) => {
console.log("详情", err);
});
@@ -667,7 +676,7 @@ export default {
key: 'name',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '讲师工号',
@@ -675,7 +684,7 @@ export default {
key: 'userNo',
align: "center",
ellipsis: true,
width: 200,
width: 160,
},
{
title: '所属组织 ',
@@ -683,88 +692,109 @@ export default {
key: 'orgName',
ellipsis: true,
align: "center",
width: 300,
scopedSlots: { customRender: "teacherOrg" },
width: 200,
},
{
title: '讲师体系',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '讲师等级',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
title: '讲师级别',
dataIndex: 'tlevelName',
key: 'tlevelName',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '发薪地',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '课程类型',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'courseType',
key: 'courseType',
ellipsis: true,
align: "center",
width: 200,
width: 160,
customRender: (value) => {
return (
<div>
{String(value.record. courseType)
? {
"0": "在线课",
"1": "面授课",
"2": "课程开发",
"3": "作业员入模培训",
"4": "其他",
}[value.record. courseType + ""]
: "-"}
</div>
)
}
},
{
title: '课程名称',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'courseName',
key: 'courseName',
ellipsis: true,
align: "center",
width: 200,
},
{
title: '授课/开发课程日期',
dataIndex: 'teachingSystem',
key: 'teachingSystem',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true,
align: "center",
width: 200,
},
{
title: '授课/开发课程时长 ',
dataIndex: 'teachingEnter',
key: 'teachingEnter',
dataIndex: 'teachingTime',
key: 'teachingTime',
ellipsis: true,
align: "center",
width: 200,
width: 160,
customRender:(value)=>{
return (
<div>
{(value.record?.teachingTime/60).toFixed(2)}小时
</div>
)
}
},
{
title: '参训人数 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'studys',
key: 'studys',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '评分 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'score',
key: 'score',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '课程基准 ',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
dataIndex: 'levelPay',
key: 'levelPay',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '计划费用 ',
@@ -772,7 +802,7 @@ export default {
key: 'expense',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '应发费用 ',
@@ -780,7 +810,7 @@ export default {
key: 'payableExpense',
ellipsis: true,
align: "center",
width: 200,
width: 160,
},
{
title: '操作 ',
@@ -789,7 +819,7 @@ export default {
ellipsis: true,
align: "center",
fixed: "right",
width: 200,
width: 160,
slots: { customRender: "appEdit" },
},
])
@@ -841,6 +871,24 @@ export default {
::v-deep .ant-descriptions-bordered .ant-descriptions-item-label{
width: 200px;
}
.headers {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.delete {
min-width: 424px;
background: #ffffff;

97
src/views/lecturer/LecturerApproval.vue
View File

@@ -12,7 +12,7 @@
</a-form-item>
<a-form-item class="select ">
<div class="select addTimeBox">
<div class="addTime" >创建时间：</div>
<div class="addTime" >汇总时间：</div>
<a-range-picker
v-model:value="searchdate"
style="width: 420px"
@@ -90,7 +90,7 @@
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'">
<a-space >
<a-button type="link" @click="goDdit(record)">编辑</a-button>
<a-button type="link" v-if="record.status != 2&&record.status!=3" @click="goDdit(record)">编辑</a-button>
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
<!-- <a-button type="link" @click="() => handleOperate(record, String(record.courseform))">审批</a-button> -->
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
@@ -109,7 +109,7 @@
v-if="tableDataTotal > 10"
:showSizeChanger="true "
:showQuickJumper="false"
:hideOnSinglePage="true"
:hideOnSinglePage="false"
:pageSize="searchParam.pageSize"
:current="searchParam.pageNo"
:total="tableDataTotal"
@@ -120,8 +120,16 @@
</div>
<!-- 弹窗组件 -->
<!--查看讲师费详情 -->
<a-drawer v-model:visible="teachingdialog" placement="right"
@closa="cancelTeachingDialog" :maskClosable="true" width="60%" title="查看讲师费用">
<a-drawer :closable="false" v-model:visible="teachingdialog" placement="right"
@closa="cancelTeachingDialog" width="60%" :title="false">
<div class="headers">
<div class="headerTitle">查看讲师费用</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"
@click="cancelTeachingDialog"
/>
</div>
<span class="line"></span>
<span>讲师费用详情</span>
<a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
@@ -139,7 +147,7 @@
<div style="padding: 10px 0;">
<div style="display: flex;margin-bottom: 20px;">
<div style="margin-right:20px;">
<a-input style="height:40px;border-radius:8px;" v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
<a-input @pressEnter="searchTeacherFeeApprovalList()" style="height:40px;border-radius:8px;" v-model:value="userNoOrName" placeholder="请输入工号/讲师名称进行搜索" />
</div>
<div style="margin-right:20px;">
<a-range-picker style="height:40px;border-radius:8px;" @change="seeDateChange" valueFormat="YYYY-MM-DD" format="YYYY-MM-DD" v-model:value="seeDateValue" />
@@ -370,11 +378,11 @@
])
//认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝
const AuthenticationStatusList = ref([
{ value: 0, label: "待确认" },
// { value: 0, label: "待确认" },
{ value: 1, label: "待提交" },
{ value: 2, label: "审核中" },
{ value: 3, label: "审核通过" },
{ value: 4, label: "审核拒绝" },
{ value: 3, label: "已审核" },
])
//状态
@@ -421,7 +429,7 @@
width: 120,
},
{
title: '汇总周期 ',
title: '汇总时间 ',
dataIndex: 'summaryDate',
key: 'summaryDate',
ellipsis: true,
@@ -614,7 +622,7 @@
const submit = (record) => {
console.log(record,'record')
dialog({
content: '确定要提交此条数据吗？',
content: '请仔细核对讲师费信息，确认无误后，将自动进入(BPM系统)审批流程',
ok: () => {
isConfirm({
id: record.id,
@@ -795,8 +803,8 @@
},
{
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true,
align: "center",
width: 120,
@@ -809,12 +817,18 @@
ellipsis: true,
align: "center",
width: 120,
customRender:(value)=>{
return (
<div>
{(value.record?.teachingTime/60).toFixed(2)}小时
</div>
)
}
},
{
title: '授课时间 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true,
align: "center",
width: 120,
@@ -822,32 +836,32 @@
},
{
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
dataIndex: 'tlevelName',
key: 'tlevelName',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
dataIndex: 'levelPay',
key: 'levelPay',
ellipsis: true,
align: "center",
width: 120,
@@ -862,16 +876,16 @@
},
{
title: '参训人数 ',
dataIndex: 'studentNum',
key: 'studentNum',
dataIndex: 'studys',
key: 'studys',
ellipsis: true,
align: "center",
width: 120,
},
{
title: '评分 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
dataIndex: 'score',
key: 'score',
ellipsis: true,
align: "center",
width: 120,
@@ -886,12 +900,14 @@
customRender: (value) => {
return (
<div>
{value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3"
{String(value.record. courseType)
? {
"1": "项目开课",
"2": "路径开课",
"3": "面授开课",
}[value.record. courseType + ""] || ""
"0": "在线课",
"1": "面授课",
"2": "课程开发",
"3": "作业员入模培训",
"4": "其他",
}[value.record. courseType + ""]
: "-"}
</div>
)
@@ -972,7 +988,24 @@
.select .ant-picker {
width: 410px !important;
}
.headers {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.addTimeBox {
position: relative;
display: flex;

63
src/views/lecturer/LecturerFee.vue
View File

@@ -66,12 +66,12 @@
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<!-- <a-form-item class="select" v-if="moreid == 2">
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
:options="AuthenticationStatusList"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item> -->
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId" allowClear
:options="lecturerSystemList"
@@ -79,7 +79,7 @@
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.tLevelId" placeholder="请选择讲师级别" allowClear
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.tLevelName" placeholder="请选择讲师级别" allowClear
:options="getLevelList"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
@@ -293,18 +293,17 @@
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="评分" name="score">
<a-input class="draitem" v-model:value="formParam.score" placeholder="请输入评分"
@blur="clearscoreNumber" allowClear
showSearch >
</a-input>
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="10" :controls="false" :min="0" :precision="2" placeholder="请输入评分"
allowClear >
</a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="课酬基准" name="levelPay">
<a-input v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）"
@blur="clearlevelPayNumber"
<a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2"
@change="clearlevelPayNumber"
allowClear showSearch class="draitem">
</a-input>
</a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -319,9 +318,9 @@
</a-col>
<a-col :span="12">
<a-form-item label="应发费用" name="payableExpense">
<a-input @blur="payExpense" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" allowClear showSearch>
</a-input>
<a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" allowClear>
</a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -402,7 +401,7 @@
<!-- <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item> -->
<a-descriptions-item label="课程名称">{{formParam.courseName || '-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组织">{{formParam.trainOrgName || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课时间 ">{{formParam.teachingDate || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课时间 ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课时长 ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{formParam.studys || '-'}}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{formParam.score || '-'}}</a-descriptions-item>
@@ -533,7 +532,7 @@
name:null,
trainOrgId:null,
tSystemId:null,
tLevelId:null,
tLevelName:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -593,8 +592,11 @@
])
//认证状态
const AuthenticationStatusList = ref([
{ value: 0, label: "未认证" },
{ value: 1, label: "已认证" },
{ value: 0, label: "待提交" },
{ value: 1, label: "待审核" },
{ value: 2, label: "审核中" },
{ value: 4, label: "审核拒绝" },
{ value: 3, label: "审核通过" },
])
const lecturerSystemList = ref([
@@ -631,7 +633,7 @@ getAllLevelList().then((res) => {
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
value: value.levelName,
label: value.levelName,
};
array.push(obj);
@@ -914,7 +916,7 @@ getAllLevelList().then((res) => {
beginTime:null,
userNo:null,
tSystemId:null,
tLevelId:null,
tLevelName:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -972,7 +974,7 @@ getAllLevelList().then((res) => {
//修改讲师费信息弹窗
const handleModify = (record) => {
state.teacherdialog = true;
state.teacherdialogtitle = '修改信息'
state.teacherdialogtitle = '编辑讲师费'
state.id= record.id
state.vf = false
TeacherSystem()
@@ -1011,6 +1013,13 @@ getAllLevelList().then((res) => {
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
state.formParam.tsystemName = state.tSystemNames.systemName
state.formParam.tsystemId = state.tSystemNames.systemId
state.formParam.courseName = state.formParam.courseName?.trim()
if(state.formParam.score){
state.formParam.score = String(state.formParam.score)
}
if(state.formParam.levelPay){
state.formParam.levelPay = String(state.formParam.levelPay)
}
const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]);
@@ -1168,6 +1177,7 @@ getAllLevelList().then((res) => {
state.teachingDate = dayjs(res.data.data.teachingDate)
state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
state.formParam.orgNames = state.formParam.orgName
state.formParam.teachingDate = dayjs(state.formParam.teachingDate).format("YYYY-MM-DD HH:mm")
})
.catch((err) => {
message.destroy()
@@ -1261,11 +1271,14 @@ getAllLevelList().then((res) => {
state.formParam.payableExpense == 0 && (state.formParam.payableExpense = null);
}
const clearlevelPayNumber = () => {
state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, '');
state.formParam.levelPay = state.formParam.levelPay?.slice(0,8);
// state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, '');
// state.formParam.levelPay = state.formParam.levelPay?.slice(0,8);
state.formParam.levelPay == 0 && (state.formParam.levelPay = null);
state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
}
watch(()=>state.formParam.levelPay,(val)=>{
state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = (state.formParam.levelPay*(state.formParam.teachingTime/60)).toFixed(2))
})
const rules = {
name: [{ required: true, message:'',log: '讲师不能为空' }],
userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
@@ -1274,8 +1287,8 @@ getAllLevelList().then((res) => {
tlevelName: [{ required: true, message:'',log: ' 讲师级别不能为空' }],
payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }],
courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
courseName: [{ required: true, message:'',log: '课程归属组织不能为空' }],
trainOrgId: [{ required: true, message: '',log:'费用来源不能为空' }],
courseName: [{ required: true, message:'',log: '课程名称不能为空' }],
trainOrgId: [{ required: true, message: '',log:'培训发生组织不能为空' }],
teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }],
teachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }],
studys: [{ required: true, message: '',log:' 参训人数不能为空' }],
@@ -1484,7 +1497,7 @@ const column = ref([
const handleExport = ()=>{
window.open (
`${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
}&trainOrgId=${ state.searchParam.trainOrgId ? state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}&levelId=${ state.searchParam.tLevelId ? state.searchParam.tLevelId : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}`
}&trainOrgId=${ state.searchParam.trainOrgId ? state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}&tLevelName=${ state.searchParam.tLevelName ? state.searchParam.tLevelName : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}`
);
// this.download('lesson_records/export', {
// ...state.searchParam