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

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2024-12-27 16:46:49 +08:00
parent 914e2d7e98
commit fb737c7334
14 changed files with 132 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,7 +279,7 @@ const columns = [
align: 'center',
width:100,
customRender: ({ text })=>{
return text||'0'
return text?text+'人':'0人'
}
},
{
@@ -291,7 +291,7 @@ const columns = [
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}
@@ -301,14 +301,20 @@ const columns = [
dataIndex: 'levelPay',
key: 'levelPay',
align: 'center',
width:100
width:100,
customRender: ({ text })=>{
return text||text==0?text+'元':'-'
}
},
{
title: '计划费用',
dataIndex: 'expense',
key: 'expense',
align: 'center',
width:100
width:100,
customRender: ({ text })=>{
return text?text+'元':'-'
}
},
// {
// title: '应发费用',

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

@@ -25,7 +25,7 @@
</div>
<div class="right">
<div class="org" :title="item?.trainOrgName">{{item?.trainOrgName||'-'}}</div>
<div class="text org" :title="item?.summaryTotal">{{item?.summaryTotal||'-'}}</div>
<div class="text org" :title="item?.summaryTotal">{{item?.summaryTotal?item?.summaryTotal+'元':'-'}}</div>
</div>
</div>
</div>
@@ -389,7 +389,7 @@ const columns = [
align: 'center',
width:100,
customRender: ({text})=>{
return text||'0'
return text ? text+'人' : '0人'
}
},
{
@@ -401,7 +401,7 @@ const columns = [
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}
@@ -412,6 +412,9 @@ const columns = [
key: 'levelPay',
align: 'center',
width:100,
customRender: ({text})=>{
return text||text==0 ? text+'元' : '-'
}
},
{
title: '计划费用',
@@ -419,6 +422,9 @@ const columns = [
key: 'expense',
align: 'center',
width:100,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
// {
// title: '应发费用',

8
src/components/project/LookExternalLecturer.vue
View File

@@ -213,6 +213,9 @@ export default{
key: 'studys',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'人' : '-'
}
},
{
title: '授课时长(分钟)',
@@ -220,6 +223,9 @@ export default{
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '评分',
@@ -230,7 +236,7 @@ export default{
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}

8
src/components/project/LookInsideLecturer.vue
View File

@@ -276,6 +276,9 @@ export default{
key: 'studys',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'人' : '-'
}
},
{
title: '授课时长(分钟)',
@@ -283,6 +286,9 @@ export default{
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '评分',
@@ -293,7 +299,7 @@ export default{
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}

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

@@ -28,8 +28,8 @@
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组织编号">{{formData?.affiliationCode||'-'}}</a-descriptions-item>
<a-descriptions-item :labelStyle="{ width: '165px' }" label="培训发生组名称">{{formData?.affiliationName||'-'}}</a-descriptions-item>
<a-descriptions-item label="是否为根节点">
<span v-if="formData?.parentName">否({{ formData?.parentName }})</span>
<span v-else>是({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批)</span>
<span v-if="formData?.parentName"><span style="margin-right:10px">否</span>({{ formData?.parentName }})</span>
<span v-else><span style="margin-right:10px">是</span>({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批)</span>
</a-descriptions-item>
<a-descriptions-item label="组织担当">{{formData?.act||'-'}}</a-descriptions-item>
<a-descriptions-item v-if="formData?.isParent==1" label="一级审批人">{{formData?.one||'-'}}</a-descriptions-item>

9
src/views/lecturer/ExternalTeaching.vue
View File

@@ -341,8 +341,8 @@
<span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
).toFixed(2) }}小时)</span>
</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-'}}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys ||'-'}}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-'}}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item>
<a-descriptions-item label="备注 " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
</a-descriptions>
<!-- <div :style="{
@@ -697,6 +697,9 @@ export default {
key: 'studys',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'人' : '-'
}
},
{
title: '评分',
@@ -707,7 +710,7 @@ export default {
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}

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

@@ -823,6 +823,9 @@ export default {
key: 'teaching',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '在职状态 ',

17
src/views/lecturer/InsideTeaching.vue
View File

@@ -422,8 +422,8 @@
<span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
).toFixed(2) }}小时)</span> </a-descriptions-item>
<a-descriptions-item label="授课/课程日期 ">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys||'-' }}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item>
<a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{ formParam.remark||'-' }}</a-descriptions-item>
</a-descriptions>
@@ -873,7 +873,7 @@ export default {
key: 'teaching',
ellipsis: true, align: "center",
scopedSlots: { customRender: "teaching" },
width: 120,
width: 140,
},
{
title: '参训人数',
@@ -881,6 +881,9 @@ export default {
key: 'studys',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'人' : '-'
}
},
{
title: '评分',
@@ -891,7 +894,7 @@ export default {
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}
@@ -1322,12 +1325,18 @@ export default {
key: 'levelPay',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text||text==0 ? text+'元' : '-'
}
}, {
title: '计划费用 ',
dataIndex: 'expense',
key: 'expense',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
// {
// title: '应发费用 ',

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

@@ -20,7 +20,7 @@
<a-descriptions-item label="审批编号">{{formData?.approvalNumber||'-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组名称">{{formData?.trainOrgName||'-'}}</a-descriptions-item>
<a-descriptions-item label="提交时间">{{formData?.approvalSubmitTime||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formData?.summaryTotal||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formData?.summaryTotal?formData?.summaryTotal+'元':'-'}}</a-descriptions-item>
<a-descriptions-item label="状态">
{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'审核拒绝',5:'待提交'}[formData?.status]}}
</a-descriptions-item>
@@ -959,7 +959,7 @@ export default {
align: "center",
width: 100,
customRender: ({text}) => {
return text || "0";
return text ? text+'人' : "0人";
}
},
{
@@ -972,7 +972,7 @@ export default {
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}
@@ -984,6 +984,9 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customRender: ({text}) => {
return text||text==0 ? text+'元' : "-";
}
},
{
title: '计划费用 ',
@@ -992,6 +995,9 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customRender: ({text}) => {
return text ? text+'元' : "-";
}
},
// {
// title: '应发费用 ',

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

@@ -137,7 +137,7 @@
<a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总时间" >{{formParam?.summaryTime||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formParam?.summaryTotal||'-'}}</a-descriptions-item>
<a-descriptions-item label="汇总金额">{{formParam?.summaryTotal?formParam?.summaryTotal+'元':'-'}}</a-descriptions-item>
<a-descriptions-item label="提交时间">{{formParam?.approvalSubmitTime||'-'}}</a-descriptions-item>
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
</a-descriptions>
@@ -469,6 +469,9 @@
ellipsis: true,
align: "center",
width: 200,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '提交时间',
@@ -974,6 +977,9 @@
ellipsis: true,
align: "center",
width: 120,
customRender: ({text}) => {
return text||text==0 ? text + '元' : '-';
}
},
{
title: '计划费用 ',
@@ -982,6 +988,9 @@
ellipsis: true,
align: "center",
width: 120,
customRender: ({text}) => {
return text ? text + '元' : '-';
}
},
{
title: '参训人数 ',
@@ -991,7 +1000,7 @@
align: "center",
width: 120,
customRender: ({text}) => {
return text || "0";
return text ? text + '人' : '-';
}
},
{
@@ -1004,7 +1013,7 @@
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}

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

@@ -527,10 +527,10 @@
<a-descriptions-item label="培训发生组织">{{formParam.trainOrgName || '-'}}</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?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</a-descriptions-item>
<a-descriptions-item label="课酬基准 ">{{formParam.levelPay || '-'}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{formParam.expense || '-'}}</a-descriptions-item>
<a-descriptions-item label="参训人数 ">{{formParam.studys?formParam.studys+'人' : '-'}}</a-descriptions-item>
<a-descriptions-item label="评分 ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item>
<a-descriptions-item label="课酬基准 ">{{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{formParam.expense?formParam.expense+'元': '-'}}</a-descriptions-item>
<!-- <a-descriptions-item label="应发费用 ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
<!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
@@ -992,6 +992,9 @@ getAllLevelList().then((res) => {
key: 'levelPay',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text||text==0 ? text+'元' : '-'
}
},
{
title: '计划费用 ',
@@ -999,6 +1002,9 @@ getAllLevelList().then((res) => {
key: 'expense',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '参训人数',
@@ -1007,7 +1013,7 @@ getAllLevelList().then((res) => {
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text||'0'
return text ? text+'人' : '0人'
}
},
{
@@ -1019,7 +1025,7 @@ getAllLevelList().then((res) => {
customRender: (value) => {
return (
<div>
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
{value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
</div>
)
}

3
src/views/lecturer/LecturerFeeStatistics.vue
View File

@@ -286,6 +286,9 @@ export default {
ellipsis: true,
align: "center",
width: '60px',
customRender: ({ text }) => {
return text ? text + '元' : '-'
}
},
{
title: '操作 ',

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

@@ -128,11 +128,11 @@
</div>
</a-form>
<!-- <span>讲师费发放情况</span> -->
<a-table :scroll="{ x: 'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column" :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
<a-table :columns="column" :scroll="{ x: '1000' }" :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
<template #bodyCell="{ record, column }">
</template>
</a-table>
<div :style="{
<!-- <div :style="{
position: 'absolute',
right: 0,
bottom: 0,
@@ -146,7 +146,7 @@
<a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
<a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
</a-button>
</div>
</div> -->
</div>
</a-drawer>
</div>
@@ -186,6 +186,7 @@ export default {
const route = useRoute();
const { query: { id }} = useRoute();
const state = reactive({
tableLoading: false,
tableLoadings: false,
opendrawer:false,
id,
@@ -294,6 +295,9 @@ export default {
ellipsis: true,
align: "center",
width: 140,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '授课时长(录入) ',
@@ -302,6 +306,9 @@ export default {
ellipsis: true,
align: "center",
width: 140,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '开发课程时长 ',
@@ -310,6 +317,9 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '计划费用 ',
@@ -318,6 +328,9 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '应发费用 ',
@@ -326,6 +339,9 @@ export default {
ellipsis: true,
align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '操作 ',
@@ -371,6 +387,7 @@ export default {
// PlaceOfPayLista()
// List接口数据
const getTableDate = (obj) => {
tableData.value = []
state.tableLoading = true
expenseSummaryById(state.searchParam)
.then((res) => {
@@ -378,6 +395,9 @@ export default {
tableData.value = res.data.data
state.tableDataTotal = Number(res.data.data.total);
state.tableLoading = false
}).catch(err=>{
state.tableLoading = false
message.error(err.data.msg)
})
};
@@ -539,7 +559,9 @@ export default {
key: 'teachingTime',
ellipsis: true, align: "center",
width: 120,
customRender: ({text})=>{
return text ? text+'分钟' : '-'
}
},
{
title: '授课时间',
@@ -579,6 +601,9 @@ export default {
key: 'levelPay',
ellipsis: true, align: "center",
width: 100,
customRender: ({text})=>{
return text||text==0 ? text+'元' : '-'
}
},
{
title: '计划费用 ',
@@ -587,6 +612,9 @@ export default {
ellipsis: true,
align: "center",
width: 100,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
{
title: '应发费用 ',
@@ -595,6 +623,9 @@ export default {
ellipsis: true,
align: "center",
width: 100,
customRender: ({text})=>{
return text ? text+'元' : '-'
}
},
])

4
src/views/lecturer/Organization.vue
View File

@@ -427,14 +427,14 @@ export default{
},
},
{
title: '是否为根节点名称',
title: '是否为根节点',
dataIndex: 'parentName',
key: 'parentName',
align: "left",
width: '200px',
customRender: ({text,record})=>{
return (
text ? <div>否({text})</div> : <div>是({{1:'一',2:'二',3:'三'}[record.code]}级审批)</div>
text ? <div><span style={{marginRight:'10px'}}>否</span>({text})</div> : <div><span style={{marginRight:'10px'}}>是</span>({{1:'一',2:'二',3:'三'}[record.code]}级审批)</div>
)
},
},