授课记录修改时间调整

This commit is contained in:
wangxuemei
2024-10-29 16:07:35 +08:00
parent 1efd0901da
commit 1f358f0059
3 changed files with 34 additions and 36 deletions

View File

@@ -2,8 +2,8 @@
<template>
<div>
<!-- 搜索框及按钮 -->
<div class="filter" style="min-width: 1380px;">
<a-form layout="inline">
<div class="filter" >
<a-form layout="inline" style="min-width: 1380px;">
<a-form-item class="select">
<!-- v-model:value="searchParam.name" -->
<!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
@@ -98,8 +98,7 @@
<!-- 表格 -->
<div style="padding: 10px 0">
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
:scroll="{ x: 1500 }" :data-source="tableData" :loading="tableLoading" @expand="expandTable"
:pagination="false">
:scroll="{ x: 1500 }" :data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'">
<a-space >
@@ -121,8 +120,7 @@
</div>
</div>
<!-- 弹窗组件 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" style="min-width: 1380px"
dropdown-style="drawaer" width="60%" :title="teacherdialogtitle">
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<!--讲师名称 teacherName 内容分类 coursetypeid -->
<a-row :gutter="16">
@@ -357,7 +355,8 @@ export default {
formParam: {
status: 1,
entryType:1,
teaching:null
teaching:null,
teachingDate:null,
},
searchdate: undefined, //选择时间
searchParam: {
@@ -775,6 +774,7 @@ export default {
const TeacherSystem = () => {
getTeacherCourseList({id:state.lookTeacherId}).then((res) => {
state.formParam = res.data.data
state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'),
console.log( state.formParam);
})
.catch((err) => {

View File

@@ -145,8 +145,8 @@
</div>
</div>
<!-- 弹窗组件 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" style="min-width: 1380px"
dropdown-style="drawaer" width="60%" :title="teacherdialogtitle">
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<!-- 讲师姓名 teacher 组织 orgName-->
<a-row :gutter="16">
@@ -209,8 +209,8 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="课程名称:" name="coursename">
<a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear showSearch>
<a-form-item label="课程名称:" name="courseName">
<a-input class="draitem" v-model:value="formParam.courseName" placeholder="请输入后搜索面授课" allowClear showSearch>
</a-input>
</a-form-item>
</a-col>
@@ -304,7 +304,7 @@
{{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 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.courseStatus == 1? '未开课' : formParam.courseStatus == 0
? '已开课' : '' }}</a-descriptions-item>
<a-descriptions-item label="授课时长 "><span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{
@@ -448,11 +448,12 @@ export default {
levelVoList: []
},
formParam: {
courseStatus: 1,
courseStatus: '1',
createFrom: 1,
teaching: null,
name:null,
teacherName: null
teacherName: null,
teachingDate:null
},
startTime:null,
searchParam:
@@ -649,16 +650,15 @@ export default {
title: '课程类型 ',
dataIndex: 'type',
key: 'type',
elipsis: true, align: "center",
elipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.type == "1" || value.record.type == "2" || value.record.type == "3"
{value.record.type == "1" || value.record.type == "0"
? {
"1": "项目开课",
"2": "路径开课",
"3": "面授开课",
"1": "在线课",
"0": "面授课",
}[value.record.type + ""] || ""
: "-"}
</div>
@@ -760,7 +760,7 @@ export default {
else if (state.moreid == 2) {
state.moreid = 1
state.searchParam.createFrom = null
state.searchParam.courseStatus = '0'
state.searchParam.courseStatus =null
state.searchParam.orgId = null
state.searchParam.tSystemId = null
state.searchParam.id = null
@@ -936,7 +936,7 @@ export default {
const cancel = () => {
state.formParam = {
recordType: 1,
courseStatus:1,
courseStatus:'1',
teacher: null,
orgName: null,
tsystemName: null,
@@ -1024,6 +1024,7 @@ export default {
state.formParam.tlevelId = res.data.data.tlevelId
state.formParam.name = res.data.data.teacherName+'/'+res.data.data.userNo
state.formParam.orgLists = res.data.data.expertiseNames?.split(',').map(item=>({ name: item }))
state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'),
console.log( state.formParam);
})
.catch((err) => {
@@ -1077,7 +1078,7 @@ export default {
width: 120,
customRender: (value) => {
return (
<div>
<div >
{value.record.status == "A10" || value.record.status == "A20" || value.record.status == "A30" || value.record.status == "E10" || value.record.status == "S20"
? {
"A10": "待审核",
@@ -1091,14 +1092,14 @@ export default {
)
}
},
{
title: '操作 ',
dataIndex: 'operation',
key: 'operation',
elipsis: true, align: "right",
width: 400,
scopedSlots: { customRender: "action" },
},
// {
// title: '操作 ',
// dataIndex: 'operation',
// key: 'operation',
// elipsis: true, align: "right",
// width: 400,
// scopedSlots: { customRender: "action" },
// },
])
const gettableDatas = (record) => {
getTeacherFeeDetail({ id: record.id })

View File

@@ -133,9 +133,9 @@ import {
import { getOrganization } from "../../api/Teaching";
import ProjectManager from "@/components/project/ProjectManagerNew";
import {getTrainOrg} from "../../api/lecturerFeeManagement";
import { queryTeacherFeeTotalList, queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo ,getPreviousTeacherfee} from "../../api/lecturerFeeStatistics";
import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
import {CostDetails} from "../lecturer/CostDetails.vue"
import * as api from '@/api/Lecturer'
// import * as api from '@/api/Lecturer'
export default {
name: "MonthlyStatistics",
components: {
@@ -168,9 +168,6 @@ export default {
payrollPlaceId: null,
departId: null,
summaryDate:null,
id: '5',
name: '李玉冰',
trainOrgId: '1820781519658237968',
},
teacherNo:null,
drawer: {
@@ -308,7 +305,7 @@ export default {
// List接口数据
const getTableDate = (obj) => {
state.tableLoading = true
api.expenseSummaryById(state.searchParam)
queryTeacherFeeMonthly(state.searchParam)
.then((res) => {
console.log(res,'resssss')
tableData.value = res.data.data.records