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

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2024-11-18 19:13:04 +08:00
parent 8fe4882156
commit 7e2d5a6d0e
8 changed files with 325 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/Lecturer.js
View File

@@ -74,7 +74,7 @@ export const getListByStatus = (obj) => http.get(`/admin/teacherExpense/getListB
//根据发生组织查询汇总的数据（一键确认弹框使用） //根据发生组织查询汇总的数据（一键确认弹框使用）
export const getListByAffiliation = (obj) => http.get(`/admin/teacherExpense/getListByAffiliation?ids=${obj.ids}&beginTime=${obj.beginTime}&endTime=${obj.endTime}&name=${obj.name}&`) export const getListByAffiliation = (obj) => http.get(`/admin/teacherExpense/getListByAffiliation?ids=${obj.ids}&beginTime=${obj.beginTime}&endTime=${obj.endTime}&name=${obj.name}&`)
//确认/一键确认 //确认/一键确认
export const teacherExpenseConfirm = (obj) => http.post('/admin/expenseBill/createSummary',obj) export const teacherExpenseConfirm = (obj) => http.post(`/admin/expenseBill/createSummary`,obj)
//确认审批 //确认审批
export const submitApproval = (obj) => http.post('/admin/expenseBill/submitApproval',obj) export const submitApproval = (obj) => http.post('/admin/expenseBill/submitApproval',obj)
//提交/撤回 //提交/撤回

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

@@ -1,12 +1,12 @@
<template> <template>
<a-drawer <a-drawer
:visible="visible" :visible="visible"
class="drawerStyle RouterFaceStu" class="drawerStyle RouterFaceStus"
placement="right" placement="right"
width="80%" width="80%"
> >
<div class="drawerMain"> <div class="drawerMains">
<div class="header"> <div class="headers">
<div class="headerTitle">{{ name }}</div> <div class="headerTitle">{{ name }}</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
@@ -220,15 +220,15 @@ const queryDrawer = () => {
<style lang="scss" scoped> <style lang="scss" scoped>
.RouterFaceStu { .RouterFaceStus {
.drawerMain { .drawerMains {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .headers {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
display: flex; display: flex;
@@ -299,6 +299,7 @@ const queryDrawer = () => {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 9;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: end; justify-content: end;

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

@@ -1,12 +1,12 @@
<template> <template>
<a-drawer <a-drawer
:visible="visible" :visible="visible"
class="drawerStyle RouterFaceStu" class="drawerStyle RouterFaceStus"
placement="right" placement="right"
width="60%" width="60%"
> >
<div class="drawerMain"> <div class="drawerMains">
<div class="header"> <div class="headers">
<div class="headerTitle">{{ name }}</div> <div class="headerTitle">{{ name }}</div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
@@ -22,7 +22,7 @@
<div class="text">汇总金额</div> <div class="text">汇总金额</div>
</div> </div>
<div class="right"> <div class="right">
<div>{{item?.trainOrgName}}</div> <div class="org" :title="item?.trainOrgName">{{item?.trainOrgName}}</div>
<div class="text">{{item?.summaryTotal}}</div> <div class="text">{{item?.summaryTotal}}</div>
</div> </div>
</div> </div>
@@ -485,15 +485,15 @@ const config = () => {
} }
} }
.RouterFaceStu { .RouterFaceStus {
.drawerMain { .drawerMains {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .headers {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
display: flex; display: flex;
@@ -537,6 +537,12 @@ const config = () => {
} }
.right{ .right{
color: #646C9A; color: #646C9A;
.org{
max-width: 180px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.text{ .text{
margin-top:20px; margin-top:20px;
} }

18
src/components/project/lockLecturer.vue
View File

@@ -106,9 +106,23 @@ const columns = [
}, },
{ {
title: '类型', title: '类型',
dataIndex: 'age', dataIndex: 'updateStatus',
key: 'age', key: 'updateStatus',
align: 'center', align: 'center',
customRender: ({text})=>{
switch (text) {
case 0:
return <span>未更改</span>;
case 1:
return <span>新增</span>;
case 2:
return <span>移除</span>;
case 3:
return <span>编辑</span>;
default:
return <span>-</span>;
}
},
}, },
{ {
title: '状态', title: '状态',

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

@@ -67,15 +67,24 @@
<button class="btn2" @click="paramsDrawer">提交</button> <button class="btn2" @click="paramsDrawer">提交</button>
</div> </div>
</div> </div>
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer" <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
width="60%" title="编辑讲师费"> 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="cancelTeacherDialog"
/>
</div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" > <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" >
<!-- 讲师姓名 name 讲师工号 userNo-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item label="讲师名称" name="name">
<SearchTeacher @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgName" v-model:user="formParam.userNo" <SearchTeacher :disabled="true" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo"
v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId" v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
v-model:payrollPlaceName="formParam.payrollPlace" v-model:level="formParam.tlevelId" ></SearchTeacher> v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -86,27 +95,33 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 讲师组织 departId 讲师体系 systemId -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师组织" name="orgName"> <a-form-item label="讲师组织" name="orgName">
<a-popover> <!-- <a-popover>
<template #content> <template #content>
{{ formParam.orgName }}. {{ formParam.orgNames }}
</template> </template> -->
<a-input disabled v-model:value="formParam.orgName" class="draitem"
placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch> <a-input :title="formParam.orgNames" disabled v-model:value="formParam.orgName" class="draitem"
</a-input> placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
</a-popover> </a-input>
</a-form-item> <!-- </a-popover> -->
</a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="tsystemName"> <a-form-item label="讲师体系" name="tsystemName">
<a-input disabled v-model:value="tSystemNames.systemName" class="draitem" <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
@change="changetlevel" .:options="LecturerSystemList">
</a-select> -->
<a-input disabled v-model:value="tSystemNames.systemName" class="draitem"
placeholder="自动带出讲师的体系" allowClear showSearch> placeholder="自动带出讲师的体系" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="tlevelName"> <a-form-item label="讲师级别" name="tlevelName">
@@ -116,13 +131,14 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师发薪地" name="payrollPlace "> <a-form-item label="讲师发薪地" name="payrollPlace">
<a-input disabled v-model:value="formParam.payrollPlace" class="draitem" <a-input disabled v-model:value="formParam.payrollPlace" class="draitem"
placeholder="自动带出讲师发薪地" allowClear showSearch > placeholder="自动带出讲师发薪地" allowClear showSearch >
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 费用类型 课程名称 courseName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="费用类型" name="courseType"> <a-form-item label="费用类型" name="courseType">
@@ -132,73 +148,97 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称" name="courseName "> <a-form-item label="课程名称" name="courseName">
<a-input v-model:value="formParam.courseName" placeholder="请输入面授课名称" class="draitem"> <!-- <a-radio-group v-model:value="formParam.courseName">
<a-radio :value="0">面授课</a-radio>
<a-radio :value="1">在线课</a-radio>
</a-radio-group> -->
<!-- <a-select class="draitem" v-model:value="formParam.courseName" placeholder="请选择输入或选择面授课" style="width:63%" allowClear
:options="getLevelList">
</a-select> -->
<a-input :maxlength="20" show-count v-model:value="formParam.courseName" placeholder="请输入面授课名称" class="draitem">
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 授课日期 teachingDate 授课时长 teachingTime -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12">
<a-form-item label="培训发生组织" name="trainOrgId">
<!-- <OrgClass
v-model:value="formParam.sourceBelongId"
v-model:name="formParam.sourceBelongFullName"
></OrgClass> -->
<a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
:options="orgList" @change="changeOrg">
</a-select>
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item label="授课/课程日期 :" name="teachingDate">
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
placeholder="请选择课程日期" /> placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
<!-- 参训人数 studys 评分 score -->
<a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="teachingTime"> <a-form-item label="授课时长" name="teachingTime">
<a-input v-model:value="formParam.teachingTime" style="width:80%; height: 40px; border-radius: 8px; " <a-input v-model:value="formParam.teachingTime" style="width:80%; height: 40px; border-radius: 8px; "
@blur="clearNonNumber" placeholder="0" allowClear showSearch suffix="分钟"> @blur="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
</a-input> </a-input>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{ <span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{
(formParam.teachingTime / 60).toFixed(2) }}小时</span> (formParam.teachingTime / 60).toFixed(2) }}小时</span>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> <span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
<a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="参训人数" name="studys"> <a-form-item label="参训人数" name="studys">
<a-input v-model:value="formParam.studys" class="draitem" @blur="clearstudysNumber" <a-input v-model:value="formParam.studys" class="draitem" @blur="clearstudysNumber"
placeholder="0 " allowClear showSearch > placeholder="请输入参训人数" allowClear showSearch >
</a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="评分" name="score">
<a-input class="draitem" v-model:value="formParam.score" placeholder="0"
@blur="clearscoreNumber" allowClear >
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<!-- 课酬基准 计划费用 expense-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课酬基准" name="levelPay"> <a-form-item label="评分" name="score">
<a-input v-model:value="formParam.levelPay" placeholder="可手动更改" <a-input class="draitem" v-model:value="formParam.score" placeholder="请输入评分"
@blur="clearlevelPayNumber" @blur="clearscoreNumber" allowClear
allowClear class="draitem"> showSearch >
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-item label="课酬基准" name="levelPay">
<a-input v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）"
@blur="clearlevelPayNumber"
allowClear showSearch class="draitem">
</a-input>
</a-form-item>
</a-col>
</a-row>
<!-- 应发费用 -->
<a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="计划费用" name="expense"> <a-form-item label="计划费用" name="expense">
<a-input class="draitem" v-model:value="formParam.expense" placeholder="" allowClear disabled <a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear disabled
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> <a-col :span="12">
<a-row :gutter="16">
<a-col :span="24">
<a-form-item label="应发费用" name="payableExpense"> <a-form-item label="应发费用" name="payableExpense">
<a-input v-model:value="formParam.payableExpense" class="draitem" <a-input @blur="payExpense" v-model:value="formParam.payableExpense" class="draitem"
placeholder="0 " allowClear> placeholder="请输入应发费用" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="16"> <!-- 备注 remark -->
<a-row :gutter="16">
<a-col :span="24"> <a-col :span="24">
<a-form-item label="备注"> <a-form-item label="备注">
<a-textarea v-model:value="formParam.remark" showCount :maxlength="200" <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
@@ -206,22 +246,22 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
<div :style="{ <div :style="{
position: 'absolute', position: 'absolute',
right: 0, right: 0,
bottom: 0, bottom: 0,
width: '100%', width: '100%',
borderTop: '1px solid #e9e9e9', borderTop: '1px solid #e9e9e9',
padding: '10px 16px', padding: '10px 16px',
background: '#fff', background: '#fff',
textAlign: 'right', textAlign: 'right',
zIndex: 1, zIndex: 1,
}"> }">
<a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button> <a-button class="drabtn" @click="cancelTeacherDialog">取消</a-button>
<a-button class="drabtn" type="primary" @click="createTeacherDialog">保存 <a-button class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
</a-button> </a-button>
</div> </div>
</a-drawer> </a-drawer>
<a-modal <a-modal
:visible="modalVisible" :visible="modalVisible"
@@ -269,6 +309,7 @@ import { useRouter,useRoute } from 'vue-router'
import dialog from '@/utils/dialog' import dialog from '@/utils/dialog'
import dayjs from "dayjs"; import dayjs from "dayjs";
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { queryTrainOrg,} from "../../api/organization";
export default { export default {
components: { components: {
SearchTeacher, SearchTeacher,
@@ -277,6 +318,7 @@ export default {
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const state = reactive({ const state = reactive({
orgList: [],
params: { params: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
@@ -327,11 +369,12 @@ export default {
state.formData = res.data.data state.formData = res.data.data
}) })
getTableList() getTableList()
orgLists()
}) })
const getTableList = () => { const getTableList = () => {
state.loading = true state.loading = true
queryExpnseByBillId({ queryExpnseByBillId({
billld: state.paramsId, billId: state.paramsId,
pageNo: state.params.pageNo, pageNo: state.params.pageNo,
pageSize: state.params.pageSize, pageSize: state.params.pageSize,
name: state.params.userNoName, name: state.params.userNoName,
@@ -354,7 +397,7 @@ export default {
} }
const pagination = computed(() => ({ const pagination = computed(() => ({
total: state.params.total, total: state.params.total,
showSizeChanger: false, showSizeChanger: true,
showQuickJumper:true, showQuickJumper:true,
current: state.params.pageNo, current: state.params.pageNo,
pageSize: state.params.pageSize, pageSize: state.params.pageSize,
@@ -426,6 +469,9 @@ export default {
const tlevelChange = (e) => { const tlevelChange = (e) => {
state.formParam.tlevelName = e?.tlevelName state.formParam.tlevelName = e?.tlevelName
state.formParam.tlevelId = e?.tlevelId state.formParam.tlevelId = e?.tlevelId
// state.formParam.payrollPlace = e?.salaryName
// state.formParam.payrollPlaceId = e?.salaryId
state.formParam.levelPay = e?.levelPay
} }
watch(()=>state.formParam.name,(val)=>{ watch(()=>state.formParam.name,(val)=>{
state.formParam.userNo = val?.split('/')[1] state.formParam.userNo = val?.split('/')[1]
@@ -441,10 +487,29 @@ export default {
}); });
}); });
} }
const orgLists = () => {
const obj = {
pageNo:1,
pageSize:50
}
queryTrainOrg(obj).then((res) => {
console.log(res,'rssssss')
state.orgList = res.data.data?.records?.map(item=>{
return{
label: item.affiliationName,
value: item.id
}
})
})
}
const changeOrg = (e,l) => {
console.log(e,'eeeee',l)
state.formParam.trainOrgName = l?.label
}
const createTeacherDialog = async () => { const createTeacherDialog = async () => {
console.log(state.formParam,'formParam') console.log(state.formParam,'formParam')
state.formParam.expense = String(state.formParam.expense) state.formParam.expense = String(state.formParam.expense)
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
state.formParam.tsystemName = state.tSystemNames.systemName state.formParam.tsystemName = state.tSystemNames.systemName
state.formParam.tsystemId = state.tSystemNames.systemId state.formParam.tsystemId = state.tSystemNames.systemId
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
@@ -454,18 +519,19 @@ export default {
return message.error(rules[formItemNames[i]][0].log) return message.error(rules[formItemNames[i]][0].log)
} }
} }
state.formParam.orgName = state.formParam.orgNames
state.formParam = {...state.formParam,...state.tSystemNames} state.formParam = {...state.formParam,...state.tSystemNames}
state.formParam.name = state.formParam?.name?.split('/')[0] state.formParam.name = state.formParam?.name?.split('/')[0]
dialog({ updateTeacherFee(state.formParam).then(response => {
content: '是否确定提交', message.success("编辑成功");
ok: ()=>{ state.teacherdialog = false;
updateTeacherFee(state.formParam).then(res => { cancel()
message.success("修改成功"); getTableDate();
state.teacherdialog = false; }).catch(err=>{
search() message.destroy()
}); state.teacherdialog = false;
} message.error(err.data.msg)
}) })
}; };
const cancelTeacherDialog = () => { const cancelTeacherDialog = () => {
formRef.value.resetFields(); formRef.value.resetFields();
@@ -532,6 +598,13 @@ export default {
} }
}) })
} }
watch(() => state.formParam.orgNames, (val) => {
if(val){
const parts = val.split('/');
const reversedParts = parts.reverse();
state.formParam.orgName = reversedParts.join('/');
}
})
const edit = (record) => { const edit = (record) => {
console.log(record,'record') console.log(record,'record')
if(record.id == 2){ if(record.id == 2){
@@ -540,7 +613,7 @@ export default {
return return
} }
state.teacherdialog = true state.teacherdialog = true
getTeacherFeeDetail({id : record.id||6}).then((res) => { getTeacherFeeDetail({id : record.id||168}).then((res) => {
state.formParam=res.data.data state.formParam=res.data.data
state.formParam.courseType = String(res.data.data.courseType) state.formParam.courseType = String(res.data.data.courseType)
state.formParam.levelPay = String(res.data.data.levelPay) state.formParam.levelPay = String(res.data.data.levelPay)
@@ -552,6 +625,8 @@ export default {
state.formParam.tlevelId = res.data.data.tlevelId state.formParam.tlevelId = res.data.data.tlevelId
state.formParam.name = res.data.data.name+'/'+res.data.data.userNo state.formParam.name = res.data.data.name+'/'+res.data.data.userNo
state.teachingDate = dayjs(res.data.data.teachingDate) state.teachingDate = dayjs(res.data.data.teachingDate)
state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
state.formParam.orgNames = state.formParam.orgName
}).catch((err) => { }).catch((err) => {
console.log("详情", err); console.log("详情", err);
}); });
@@ -718,6 +793,8 @@ export default {
validateField, validateField,
tlevelChange, tlevelChange,
createTeacherDialog, createTeacherDialog,
changeOrg,
orgLists,
cancelTeacherDialog, cancelTeacherDialog,
formRef, formRef,
courseTypeList, courseTypeList,

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

@@ -151,7 +151,7 @@
</div> </div>
<div style="padding-bottom:70px"> <div style="padding-bottom:70px">
<a-table :scroll="{x:'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamine" <a-table :scroll="{x:'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamine"
:data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="false"> :data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
</a-table> </a-table>
</div> </div>
</div> </div>
@@ -159,7 +159,7 @@
<a-tab-pane key="2" tab="讲师费审批记录" force-render> <a-tab-pane key="2" tab="讲师费审批记录" force-render>
<div style="padding-bottom:70px"> <div style="padding-bottom:70px">
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamineTwo" <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columnsExamineTwo"
:data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="false"> :data-source="tableDataExamine" :loading="examinetableLoading" @expand="expandTable" :pagination="pagination">
</a-table> </a-table>
</div> </div>
</a-tab-pane> </a-tab-pane>
@@ -688,7 +688,7 @@
const tableDataExamine = ref([]) const tableDataExamine = ref([])
const gettableDataExamine = () => { const gettableDataExamine = () => {
queryExpnseByBillId({ queryExpnseByBillId({
billld : state.id, billId : state.id,
pageNo: state.tableDataParams.pageNo, pageNo: state.tableDataParams.pageNo,
pageSize: state.tableDataParams.pageSize, pageSize: state.tableDataParams.pageSize,
name: state.userNoOrName, name: state.userNoOrName,

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

@@ -252,16 +252,19 @@
<!-- 授课日期 teachingDate 授课时长 teachingTime --> <!-- 授课日期 teachingDate 授课时长 teachingTime -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程归属组织" name="sourceBelongId"> <a-form-item label="培训发生组织" name="trainOrgId">
<OrgClass <!-- <OrgClass
v-model:value="formParam.sourceBelongId" v-model:value="formParam.sourceBelongId"
v-model:name="formParam.sourceBelongFullName" v-model:name="formParam.sourceBelongFullName"
></OrgClass> ></OrgClass> -->
<a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
:options="orgList" @change="changeOrg">
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item label="授课/课程日期 :" name="teachingDate">
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
placeholder="请选择课程日期" /> placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -395,11 +398,12 @@
<a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item> <a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item>
<a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item> <a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item>
<a-descriptions-item label="讲师发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item> <a-descriptions-item label="讲师发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
<a-descriptions-item label="费用类型">{{{1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item> <a-descriptions-item label="费用类型">{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item> <!-- <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.courseName || '-'}}</a-descriptions-item>
<a-descriptions-item label="授课时长 ">{{formParam.teachingTime || '-'}}</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.studys || '-'}}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{formParam.score || '-'}}</a-descriptions-item> <a-descriptions-item label="评分 ">{{formParam.score || '-'}}</a-descriptions-item>
<a-descriptions-item label="课酬基准 ">{{formParam.levelPay || '-'}}</a-descriptions-item> <a-descriptions-item label="课酬基准 ">{{formParam.levelPay || '-'}}</a-descriptions-item>
@@ -428,7 +432,7 @@
textAlign: 'right', textAlign: 'right',
zIndex: 1, zIndex: 1,
}"> }">
<a-button class="drabtn" type="primary" @click="cancelTeachingDialog(true)">提交</a-button> <a-button class="drabtn" type="primary" @click="cancelTeachingDialog(false)">确定</a-button>
<a-button class="drabtn" @click="cancelTeachingDialog(false)" :loading="buttonLoading">取消 <a-button class="drabtn" @click="cancelTeachingDialog(false)" :loading="buttonLoading">取消
</a-button> </a-button>
</div> </div>
@@ -454,7 +458,7 @@
import ImportWork from "../../components/project/ImportWork.vue"; import ImportWork from "../../components/project/ImportWork.vue";
import SearchTeacher from "@/components/project/SearchTeacher"; import SearchTeacher from "@/components/project/SearchTeacher";
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,getListByIds,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement"; import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,getListByIds,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";
import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,teacherExpenseConfirm } from "../../api/Lecturer"; import {getTeacherSystemList, getAllLevelList,getPayRollPlace,fileUp,submitApproval } from "../../api/Lecturer";
// lecturerFeeManagement // lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu"; // import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher" // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -519,8 +523,8 @@
userNo: null, userNo: null,
payrollPlace: null, payrollPlace: null,
payrollPlaceId: null, payrollPlaceId: null,
sourceBelongId: null, trainOrgId: null,
sourceBelongFullName: null, trainOrgName: null,
}, },
searchdate: null, //选择时间 searchdate: null, //选择时间
allsearchdate: null, //选择时间 allsearchdate: null, //选择时间
@@ -686,6 +690,13 @@ getAllLevelList().then((res) => {
} }
} }
const columnSee = ref([ const columnSee = ref([
{
title: '审批层级',
dataIndex: 'name',
key: 'name',
ellipsis: true,
align: "center",
},
{ {
title: '审批人 ', title: '审批人 ',
dataIndex: 'name', dataIndex: 'name',
@@ -723,13 +734,13 @@ getAllLevelList().then((res) => {
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 120, width: 120,
}, },
{ // {
title: '讲师工号 ', // title: '讲师工号 ',
dataIndex: 'userNo', // dataIndex: 'userNo',
key: 'userNo', // key: 'userNo',
ellipsis: true, align: "center", // ellipsis: true, align: "center",
width: 120, // width: 120,
}, // },
{ {
title: '课程名称 ', title: '课程名称 ',
dataIndex: 'courseName', dataIndex: 'courseName',
@@ -738,98 +749,12 @@ getAllLevelList().then((res) => {
align: "center", align: "center",
width: 200, width: 200,
}, },
{
title: '培训发生组织',
dataIndex: 'trainOrg',
key: 'trainOrg',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时间 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师体系',
dataIndex: 'systemName',
key: 'systemName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'levelName',
key: 'levelName',
ellipsis: true, align: "center",
width: 120,
// customRender: (value, record) => {
// return (
// <div>
// {value.record.grade == 0 || value.record.grade == 1 || value.record.grade == 2 || value.record.grade == 3
// ? {
// 0: "未定级",
// 1: "1级",
// 2: "2级",
// 3: "3级",
// }[value.record.grade + ""] || ""
// : "-"}
// </div>
// )
// }
},
{
title: '发薪地 ',
dataIndex: 'teacherpayrollPlace',
key: 'teacherpayrollPlace',
ellipsis: true, align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'teacherlevelPay',
key: 'teacherlevelPay',
ellipsis: true, align: "center",
width: 120,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
ellipsis: true, align: "center",
width: 120,
},
{
title: '参训人数 ',
dataIndex: 'studentNum',
key: 'studentNum',
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分 ',
dataIndex: 'courseAssess',
key: 'courseAssess',
ellipsis: true, align: "center",
width: 120,
},
{ {
title: '课程类型 ', title: '课程类型 ',
dataIndex: ' courseType', dataIndex: ' courseType',
key: ' courseType', key: ' courseType',
ellipsis: true, align: "center", ellipsis: true,
align: "center",
width: 120, width: 120,
customRender: (value) => { customRender: (value) => {
return ( return (
@@ -845,11 +770,77 @@ getAllLevelList().then((res) => {
) )
} }
}, },
{
title: '培训发生组织',
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '授课时长 ',
dataIndex: 'teachingTime',
key: 'teachingTime',
ellipsis: true, align: "center",
width: 120,
customRender:(value)=>{
return (
<div>
{(value.record?.teachingTime/60).toFixed(2)}小时
</div>
)
}
},
{
title: '授课日期',
dataIndex: 'teachingDate',
key: 'teachingDate',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师体系',
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '讲师级别 ',
dataIndex: 'tlevelName',
key: 'tlevelName',
ellipsis: true, align: "center",
width: 120,
},
{
title: '发薪地 ',
dataIndex: 'payrollPlace',
key: 'payrollPlace',
ellipsis: true, align: "center",
width: 120,
},
{
title: '基准课酬 ',
dataIndex: 'levelPay',
key: 'levelPay',
ellipsis: true, align: "center",
width: 120,
},
{
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
ellipsis: true, align: "center",
width: 120,
},
{ {
title: '状态 ', title: '状态 ',
dataIndex: 'status', dataIndex: 'status',
key: 'status', key: 'status',
ellipsis: true, align: "center", ellipsis: true,
align: "center",
width: 120, width: 120,
customRender: (value) => { customRender: (value) => {
return ( return (
@@ -866,10 +857,24 @@ getAllLevelList().then((res) => {
) )
} }
}, },
{
title: '参训人员',
dataIndex: 'studys',
key: 'studys',
ellipsis: true, align: "center",
width: 120,
},
{
title: '评分 ',
dataIndex: 'score',
key: 'score',
ellipsis: true, align: "center",
width: 120,
},
{ {
title: '讲师组织', title: '讲师组织',
dataIndex: 'trainOrg', dataIndex: 'orgName',
key: 'trainOrg', key: 'orgName',
ellipsis: true, align: "center", ellipsis: true, align: "center",
width: 200, width: 200,
scopedSlots: { customRender: "trainOrg" }, scopedSlots: { customRender: "trainOrg" },
@@ -989,6 +994,10 @@ getAllLevelList().then((res) => {
state.formParam.orgName = reversedParts.join('/'); state.formParam.orgName = reversedParts.join('/');
} }
}) })
const changeOrg = (e,l) => {
console.log(e,'eeeee',l)
state.formParam.trainOrgName = l?.label
}
//保存 //保存
const createTeacherDialog = async () => { const createTeacherDialog = async () => {
console.log(state.formParam,'formParam') console.log(state.formParam,'formParam')
@@ -1114,8 +1123,8 @@ getAllLevelList().then((res) => {
payableExpense:null, payableExpense:null,
expense:null, expense:null,
remark:null, remark:null,
sourceBelongId: null, trainOrgId: null,
sourceBelongFullName: null, trainOrgName: null,
} }
state.id = null state.id = null
state.teachingDate=null state.teachingDate=null
@@ -1206,7 +1215,7 @@ getAllLevelList().then((res) => {
dialog({ dialog({
content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。', content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。',
ok: () => { ok: () => {
teacherExpenseConfirm({ids:state.formParam.id}).then(res=>{ submitApproval({ids:state.formParam.id}).then(res=>{
console.log(res,'resssss') console.log(res,'resssss')
if(res.data.code == 200){ if(res.data.code == 200){
message.success('提交成功') message.success('提交成功')
@@ -1258,7 +1267,7 @@ getAllLevelList().then((res) => {
payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }], payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }],
courseType: [{ required: true, message: '',log:'费用类型不能为空' }], courseType: [{ required: true, message: '',log:'费用类型不能为空' }],
courseName: [{ required: true, message:'',log: '课程归属组织不能为空' }], courseName: [{ required: true, message:'',log: '课程归属组织不能为空' }],
sourceBelongId: [{ required: true, message: '',log:'费用来源不能为空' }], trainOrgId: [{ required: true, message: '',log:'费用来源不能为空' }],
teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }], teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }],
teachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }], teachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }],
studys: [{ required: true, message: '',log:' 参训人数不能为空' }], studys: [{ required: true, message: '',log:' 参训人数不能为空' }],
@@ -1547,6 +1556,7 @@ const column = ref([
handleModify, handleModify,
// closeDeleteTeacher, // closeDeleteTeacher,
createTeacherDialog, createTeacherDialog,
changeOrg,
handleOperate, handleOperate,
closehandleOperate, closehandleOperate,
getTableDate, //list接口数据调用 getTableDate, //list接口数据调用

2
src/views/lecturer/MonthlyStatistics.vue
View File

@@ -318,7 +318,7 @@ export default {
console.log("获取发薪地", PlaceOfPayList); console.log("获取发薪地", PlaceOfPayList);
}) })
} }
PlaceOfPayLista() // PlaceOfPayLista()
// List接口数据 // List接口数据
const getTableDate = (obj) => { const getTableDate = (obj) => {
state.tableLoading = true state.tableLoading = true