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

授课记录新增时间调整

Browse Source
This commit is contained in:
wangxuemei
2024-10-25 14:41:26 +08:00
parent b30f5a63e5
commit e339967189
3 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,8 +155,8 @@
<!-- 课程名称：name 开课状态 status--> <!-- 课程名称：name 开课状态 status-->
<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="coursename">
<a-input class="draitem" v-model:value="formParam.name" placeholder="请输入后搜索面授课" allowClear <a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -173,8 +173,8 @@
<!-- 授课日期 beginTime 授课时长defaultTeachingTime--> <!-- 授课日期 beginTime 授课时长defaultTeachingTime-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="beginTime"> <a-form-item label="授课/课程日期 :" name="formParamdate">
<a-date-picker class="draitem" v-model:value="formParam.beginTime" style="width: 100%" format="YYYY-MM-DD" <a-date-picker class="draitem" v-model:value="formParamdate" style="width:100%" format="YYYY-MM-DD"
placeholder="请选择课程日期" /> placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -350,6 +350,7 @@ export default {
pageSize: 10, pageSize: 10,
beginTime: null, //开始时间 beginTime: null, //开始时间
endTime: null, //结束时间 endTime: null, //结束时间
formParamdate: undefined, //选择时间
tableDataTotal: -1,//table列表总条数 tableDataTotal: -1,//table列表总条数
formParam: { formParam: {
status: 1, status: 1,
@@ -384,12 +385,12 @@ export default {
const AddressList = ref([ const AddressList = ref([
]); ]);
const rules = { const rules = {
teacher: [{ required: true, message: '',log:'讲师不能为空' }], name: [{ required: true, message: '',log:'讲师不能为空' }],
coursetypeid: [{ required: true, message:'',log: '内容分类不能为空' }], courseTypeId: [{ required: true, message:'',log: '内容分类不能为空' }],
name: [{ required: true, message: '',log:'课程名称不能为空' }], courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
status: [{ required: true, message:'',log: '讲开课状态不能为空' }], status: [{ required: true, message:'',log: '讲开课状态不能为空' }],
duration: [{ required: true, message: '',log:'授课时长不能为空' }], duration: [{ required: true, message: '',log:'授课时长不能为空' }],
beginTime: [{ required: true, message:'',log: '授课日期不能为空' }], formParamdate: [{ required: true, message:'',log: '授课日期不能为空' }],
} }
//获取开课场地 //获取开课场地
@@ -684,6 +685,7 @@ export default {
} }
} }
state.formParam = {...state.formParam} state.formParam = {...state.formParam}
state.formParam.beginTime=state.formParamdate ? dayjs(state.formParamdate).format("YYYY-MM-DD") : ""
if (state.vf == false) { if (state.vf == false) {
updateInTeacherCourse(state.formParam).then(response => { updateInTeacherCourse(state.formParam).then(response => {
message.success("修改成功"); message.success("修改成功");
@@ -771,7 +773,7 @@ export default {
score: null, score: null,
remark: null, remark: null,
} }
state.formParamdate=null
} }
//展开切换 //展开切换
const handlemoreid = () => { const handlemoreid = () => {

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

@@ -218,9 +218,10 @@
<!-- 授课日期 beginTime 开课状态 courseStatus --> <!-- 授课日期 beginTime 开课状态 courseStatus -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="beginTime"> <a-form-item label="授课/课程日期 :" name="formParamdate">
<a-date-picker class="draitem" v-model:value="formParam.beginTime" style="width:100%" format="YYYY-MM-DD" <a-date-picker class="draitem" v-model:value="formParamdate" style="width:100%" format="YYYY-MM-DD"
placeholder="请选择课程日期" @change="editTimeChange" /> placeholder="请选择课程日期" />
<!-- @change="editTimeChange" -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -318,7 +319,7 @@
<span>讲师费发放情况</span> <span>讲师费发放情况</span>
</div> </div>
<a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column" <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column"
:data-source="tableDatas" :loading="tableLoadings" :pagination="false"> :data-source="tableDatas" :pagination="false">
<template #bodyCell="{ record, column }"> <template #bodyCell="{ record, column }">
<template v-if="column.key === 'operation'"> <template v-if="column.key === 'operation'">
<a-space> <a-space>
@@ -437,6 +438,7 @@ export default {
pageSize: 10, pageSize: 10,
tableDataTotal: -1,//table列表总条数 tableDataTotal: -1,//table列表总条数
searchdate: undefined, //选择时间 searchdate: undefined, //选择时间
formParamdate: undefined, //选择时间
beginTime: null, //开始时间 beginTime: null, //开始时间
endTime: null, //结束时间 endTime: null, //结束时间
tSystemNames:{ tSystemNames:{
@@ -775,11 +777,11 @@ export default {
// // state.searchParam.endTime = state.endTime ? state.endTime : null // // state.searchParam.endTime = state.endTime ? state.endTime : null
// } // }
const editTimeChange = (e, date) => { // const editTimeChange = (e, date) => {
console.log(date); // console.log(date);
state.beginTime = date; // state.beginTime = date;
// console.log(date, state.searchParam.beginTime, state.searchParam.endTime); // // console.log(date, state.searchParam.beginTime, state.searchParam.endTime);
}; // };
//重置 //重置
const searchReset = () => { const searchReset = () => {
state.searchdate= undefined, state.searchdate= undefined,
@@ -854,6 +856,7 @@ export default {
} }
//保存 //保存
const createTeacherDialog = async () => { const createTeacherDialog = async () => {
console.log( state.formParam)
state.formParam.tSystemName = state.tSystemNames.systemName state.formParam.tSystemName = state.tSystemNames.systemName
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){ for(let i=0;i<formItemNames.length;i++){
@@ -863,6 +866,7 @@ export default {
} }
} }
state.formParam = {...state.formParam,...state.tSystemNames} state.formParam = {...state.formParam,...state.tSystemNames}
state.formParam.beginTime=state.formParamdate ? dayjs(state.formParamdate).format("YYYY-MM-DD") : ""
if (state.vf == false) { if (state.vf == false) {
updateInTeacherCourse(state.formParam).then(response => { updateInTeacherCourse(state.formParam).then(response => {
message.success("修改成功"); message.success("修改成功");
@@ -928,16 +932,14 @@ export default {
levelId: null, levelId: null,
courseName: null, courseName: null,
duration:null, duration:null,
endTime: null,
beginTime: null,
studys: null, studys: null,
score: null, score: null,
type: null, type: null,
remark: null, remark: null,
offcourseId: null, offcourseId: null,
createFrom: null, createFrom: null,
} }
state.formParamdate=null
state.tSystemNames = { state.tSystemNames = {
systemName:null, systemName:null,
levelVoList: [] levelVoList: []
@@ -1091,13 +1093,13 @@ export default {
} }
const tableDatas = ref([]) const tableDatas = ref([])
const rules = { const rules = {
teacher: [{ required: true, message:'',log: '讲师不能为空' }], name: [{ required: true, message:'',log: '讲师不能为空' }],
orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
levelId: [{ required: true, message: '',log:'讲师级别不能为空' }], levelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
tSystemName: [{ required: true, message: '',log:'讲师体系不能为空' }], tSystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
id: [{ required: true, message: '',log:'内容分类不能为空' }], courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }],
courseName: [{ required: true, message: '',log:'课程名称不能为空' }], courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
beginTime: [{ required: true, message: '',log:'授课/课程日期不能为空' }], formParamdate: [{ required: true, message: '',log:'授课/课程日期不能为空' }],
duration: [{ required: true, message:'',log: '授课时长不能为空' }], duration: [{ required: true, message:'',log: '授课时长不能为空' }],
courseStatus: [{ required: true, message: '',log:'开课状态不能为空' }], courseStatus: [{ required: true, message: '',log:'开课状态不能为空' }],
} }
@@ -1221,7 +1223,7 @@ export default {
getOrganizationList, getOrganizationList,
// searchTimeChange, // searchTimeChange,
cancelTeachingDialog, cancelTeachingDialog,
editTimeChange, // editTimeChange,
scoreChange scoreChange
} }
}, },

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

@@ -68,7 +68,7 @@
</a-select> </a-select>
</a-form-item> </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" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemid" allowClear <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemId" allowClear
:options="lecturerSystemList" @change="changetlevel"> :options="lecturerSystemList" @change="changetlevel">
</a-select> </a-select>
</a-form-item> </a-form-item>
@@ -150,7 +150,7 @@
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer" <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
width="60%" :title="teacherdialogtitle"> width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" > <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" >
<!-- 讲师姓名 name 讲师工号 teacherNo--> <!-- 讲师姓名 name 讲师工号 userNo-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="teacher"> <a-form-item label="讲师名称" name="teacher">
@@ -356,7 +356,7 @@
<span>讲师费用详情</span> <span>讲师费用详情</span>
<a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter"> <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
<a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item> <a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
<a-descriptions-item label="讲师工号">{{formParam.teacherNo}}</a-descriptions-item> <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
<a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item> <a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item> <a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item>
<a-descriptions-item label="讲师级别">{{formParam.levelName }}</a-descriptions-item> <a-descriptions-item label="讲师级别">{{formParam.levelName }}</a-descriptions-item>
@@ -500,10 +500,10 @@
}, },
searchdate: null, //选择时间 searchdate: null, //选择时间
searchParam: { searchParam: {
teacherNo:null, userNo:null,
name:null, name:null,
trainorgId:null, trainorgId:null,
tsystemid:null, tsystemId:null,
levelId:null, levelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -643,8 +643,8 @@ console.log( "讲师体系id" +val);
}, },
{ {
title: '讲师工号 ', title: '讲师工号 ',
dataIndex: 'teacherNo', dataIndex: 'userNo',
key: 'teacherNo', key: 'userNo',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 120,
}, },
@@ -818,8 +818,8 @@ console.log( "讲师体系id" +val);
state.searchParam = { state.searchParam = {
endTime:null, endTime:null,
beginTime:null, beginTime:null,
teacherNo:null, userNo:null,
tsystemid:null, tsystemId:null,
levelId:null, levelId:null,
courseType:null, courseType:null,
certStatus:null, certStatus:null,
@@ -1001,9 +1001,9 @@ console.log( "讲师体系id" +val);
const cancel = () => { const cancel = () => {
state.formParam ={ state.formParam ={
teacher:null, teacher:null,
teacherNo:null, userNo:null,
departId:null, departId:null,
tsystemid:null, tsystemId:null,
levelId:null, levelId:null,
payrollPlaceName:null, payrollPlaceName:null,
tSystemName: null, tSystemName: null,
@@ -1092,7 +1092,7 @@ console.log( "讲师体系id" +val);
} }
const rules = { const rules = {
name: [{ required: true, message:'',log: '讲师不能为空' }], name: [{ required: true, message:'',log: '讲师不能为空' }],
teacherNo: [{ required: true, message: '',log:'讲师工号不能为空' }], userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
departId: [{ required: true, message: '',log:'讲师组织不能为空' }], departId: [{ required: true, message: '',log:'讲师组织不能为空' }],
tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }], tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
@@ -1109,8 +1109,8 @@ console.log( "讲师体系id" +val);
} }
function managerChange(e, l, d, t, orgName) { function managerChange(e, l, d, t, orgName) {
console.log(e, l); console.log(e, l);
state.searchParam.teacherNo = d; state.searchParam.userNo = d;
state.searchParam.teacherNo = t; state.searchParam.userNo = t;
// state.searchParam.trainorgName=orgName // state.searchParam.trainorgName=orgName
} }
const handleImport = () => { const handleImport = () => {
@@ -1156,8 +1156,8 @@ const column = ref([
}, },
{ {
title: '讲师工号 ', title: '讲师工号 ',
dataIndex: 'teacherNo', dataIndex: 'userNo',
key: 'teacherNo', key: 'userNo',
elipsis: true, align: "center", elipsis: true, align: "center",
width: 120, width: 120,
}, },
@@ -1322,12 +1322,8 @@ const column = ref([
//导出功能 //导出功能
const handleExport = ()=>{ const handleExport = ()=>{
window.open ( window.open (
`${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${ `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
state.searchParam.pageNo }&tsystemId=${ state.searchParam.tsystemId ? state.searchParam.tsystemId : ""}&levelId=${state.searchParam.levelId ? state.searchParam.levelId : ""
}&pageSize=${state.searchParam.pageSize}&name=${
state.searchParam.name ? state.searchParam.name : ""
}&tsystemid=${ state.searchParam.tsystemid ? state.searchParam.tsystemid : ""}&levelId=${
state.searchParam.levelId ? state.searchParam.levelId : ""
}&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${ }&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${
state.searchParam.certStatus ? state.searchParam.certStatus : "" state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}` }&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}`
@@ -1337,7 +1333,6 @@ const column = ref([
// }, `project_${new Date().getTime()}.xlsx` ) // }, `project_${new Date().getTime()}.xlsx` )
} }
const beforeUpload2 = (file) => { const beforeUpload2 = (file) => {
console.log(6765555);
console.log(file); console.log(file);
const fileType = [ const fileType = [
"xls", "xls",