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

讲师费时间筛选调整

Browse Source
This commit is contained in:
wangxuemei
2024-09-04 17:24:59 +08:00
parent ed8b4769de
commit a881058e44
9 changed files with 560 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/lecturer/ExternalLecturer.vue
View File

@@ -200,7 +200,7 @@
<span>您确定要删除此讲师吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeDeleteTeacher">
@@ -226,7 +226,7 @@
<span v-if="handleOperate1 == 1">确定要将该讲师停用吗<div></div>停用后讲师不可登录教师端</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closehandleOperate">
@@ -546,6 +546,11 @@ export default {
state.teacherdialog = false
cancel()
}
// state.deleteTeacherdialog = false
// state.editTeacher = false
// state.tagsshow = 1
};
const cancelTeacherDialog1 = () => {
state.deleteTeacherdialog = false
state.editTeacher = false
state.tagsshow = 1
@@ -658,7 +663,7 @@ export default {
closehandleOperate,
getTableDate, //list接口数据调用
TeacherSystem,
cancelTeacherDialog1,
// getpromotionrecordstableData
}
},

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

@@ -9,12 +9,8 @@
<!-- <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input> -->
<div style="width: 276px; height: 40px; border-radius: 8px" >
<ProjectManager v-model:value="searchParam.userNo"
v-model:name="searchParam.teacher"
placeholder="请输入工号/讲师姓名进行检索"
@onChange="managerChange" mode="multiple"></ProjectManager>
</div>
<a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入工号/讲师姓名进行检索" showSearch
allowClear v-model:name="searchParam.teacherNameOrUserNo"></a-input>
</a-form-item>
<a-form-item class="select">
<a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
@@ -22,9 +18,19 @@
</a-input>
</a-form-item>
<a-form-item class="select ">
<a-range-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" @change="searchTimeChange" />
</a-form-item>
<div class="select addTimeBox">
<div class="addTime" >创建时间：</div>
<a-range-picker
v-model:value="searchdate"
style="width: 420px"
@change="searchTimeChange"
format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</a-form-item>
<div style="display: flex; margin-bottom: 20px">
<a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
<!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
@@ -109,7 +115,7 @@
<!-- 弹窗组件 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
dropdown-style="drawaer" width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<!--讲师名称 teacher 内容分类 systypeid -->
<a-row :gutter="16">
<a-col :span="12">
@@ -252,7 +258,7 @@
<span>您确定要删除此条记录吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeDeleteTeacher">
@@ -297,6 +303,7 @@ export default {
ProjectManagerOutTeacher,
},
setup() {
const formRef = ref();
const store = useStore();
const router = useRouter();
const state = reactive({
@@ -318,7 +325,9 @@ export default {
entryType:1,
duration:0
},
searchdate: null, //选择时间
searchParam: {
teacherNameOrUserNo:null,
teacherType:'1',
pageNo: 1,
pageSize: 10,
@@ -331,17 +340,16 @@ export default {
entryType:null,
},
})
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
function searchTimeChange(time, timeStr) {
let startTime = timeStr[0]
let endTime = timeStr[1] ;
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
};
}
const AddressList = ref([
]);
const rules = {
@@ -559,6 +567,7 @@ export default {
};
//重置
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
teacherType:'1',
pageNo: 1,
@@ -613,24 +622,34 @@ export default {
TeacherSystem()
}
//保存
const createTeacherDialog = () => {
if (state.vf == false) {
updateInTeacherCourse(state.formParam).then(response => {
const createTeacherDialog = () => {
formRef.value
.validate()
.then(() => {
if (state.vf == false) {
updateInTeacherCourse(state.formParam).then(response => {
message.success("修改成功");
state.teacherdialog = false;
cancel()
getTableDate();
});
}
else {
insertInTeacherCourse(state.formParam)
.then((res) => {
message.success("保存成功");
state.teacherdialog = false;
cancel()
getTableDate();
}).catch((err) => {
console.log(err);
});
cancel()
}
getTableDate();
state.teacherdialog = false
}
}
})
.catch(() => {
console.log('error', error);
});
};
//删除弹窗
const deleteModal = (record) => {
state.deleteTeacherdialog = true
@@ -676,12 +695,15 @@ export default {
//取消按钮 清空输入的数据
const cancelTeacherDialog = () => {
if (state.teacherdialog = true) {
formRef.value.resetFields();
state.teacherdialog = false
cancel()
}
state.deleteTeacherdialog = false
};
const cancelTeacherDialog1 = () => {
state.deleteTeacherdialog = false
};
//清空数据
const cancel = () => {
state.formParam = {
@@ -759,6 +781,7 @@ export default {
return {
...toRefs(state),
rules,
formRef,
clearNonNumber,
managerChange,
entryTypeList,
@@ -778,6 +801,7 @@ export default {
changePagination,
addTeacher,
cancelTeacherDialog,
cancelTeacherDialog1,
handleLook,
cancel,
deleteModal,
@@ -799,24 +823,31 @@ export default {
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
}
.addTime {
position: absolute;
z-index: 1;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
::v-deep .ant-picker-range .ant-picker-active-bar {
margin-left: 85px !important;
}
}
//导出按钮icon
.daochu {
width: 16px;
height: 18px;
background-image: url("../../assets/images/coursewareManage/export1.png");
}
}
//弹窗内详情样式
.display1 {

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

@@ -16,7 +16,7 @@
</a-select>
</a-form-item>
<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.levelId" placeholder="请选择讲师级别" allowClear
:options="getLevelList" :disabled="getLevelList.length !== 0 ? false : true">
</a-select>
</a-form-item>
@@ -171,16 +171,16 @@
</a-row>
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="讲师体系" name="tsystemId">
<a-select class="draitem" v-model:value="formParam.tsystemId" placeholder="请选择讲师体系" allowClear
<a-form-item label="讲师体系" name="systemId">
<a-select class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系" allowClear
@change="changetlevel" :options="LecturerSystemList">
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="讲师级别" name="tlevelId">
<a-form-item label="讲师级别" name="levelId">
<div @click="handlesel">
<a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
<a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" allowClear
:disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList">
</a-select>
</div>
@@ -347,15 +347,15 @@
</a-row>
<a-row :gutter="16">
<a-col :span="24">
<a-form-item label="讲师体系" name="tsystemId">
<a-select class="draitem" v-model:value="formParam.tsystemId" placeholder="请选择讲师体系" allowClear
<a-form-item label="讲师体系" name="systemId">
<a-select class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系" allowClear
@change="changetlevel" :options="LecturerSystemList">
</a-select>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="讲师级别" name="tlevelId">
<a-select class="draitem" v-model:value="formParam.tlevelId" placeholder="请选择讲师级别" allowClear
<a-form-item label="讲师级别" name="levelId">
<a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别" allowClear
:disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList">
</a-select>
</a-form-item>
@@ -483,7 +483,7 @@
<span>您确定要删除此讲师吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeDeleteTeacher">
@@ -510,7 +510,7 @@
<span v-if="handleOperate1 == 1">确定要将该讲师停用吗<div></div>停用后讲师不可登录教师端</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closehandleOperate">
@@ -600,7 +600,7 @@ export default {
pageSize1: 10,
teacherNameOrUserNo: null,
systemId: null,
tlevelId: null,
levelId: null,
waitStatus: null,
certStatus: null,
courses: null,
@@ -961,7 +961,7 @@ export default {
])
// 搜索
const searchSubmit = () => {
store.commit("setShouInclude", ['lecturerlist']);
// store.commit("setShouInclude", ['lecturerlist']);
getTableDate();
};
//重置
@@ -972,7 +972,7 @@ export default {
userNo: null,
newdepartId: null,
systemid: null,
tlevelId: null,
levelId: null,
waitStatus: null,
certStatus: null,
salaryName: null,
@@ -981,7 +981,7 @@ export default {
pageNo: 1,
pageSize: 10,
};
store.commit("setShouInclude", []);
// store.commit("setShouInclude", []);
getTableDate();
};
// List接口数据
@@ -1148,11 +1148,15 @@ export default {
state.teacherdialog = false
cancel()
}
// state.deleteInTeacherdialog = false
// state.editTeacher = false
// state.tagsshow = 1
};
const cancelTeacherDialog1 = () => {
state.deleteInTeacherdialog = false
state.editTeacher = false
state.tagsshow = 1
};
//清空数据
const cancel = () => {
state.formParam = {
@@ -1162,9 +1166,9 @@ export default {
photo: null,
teacherNameOrUserNo: null,
newdepartId: null,
tlevelId: null,
levelId: null,
defaultteachingTime: 0,
tsystemId: null,
systemId: null,
certStatus: 0,
description: '',
workExperience: '',
@@ -1177,8 +1181,8 @@ export default {
const rules = {
name: [{ required: true, message: '讲师不能为空' }],
newdepartId: [{ required: true, message: '组织不能为空' }],
tlevelId: [{ required: true, message: '讲师级别不能为空' }],
tsystemId: [{ required: true, message: '讲师体系不能为空' }],
levelId: [{ required: true, message: '讲师级别不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }],
defaultteachingTime: [{ required: true, message: '' }],
certStatus: [{ required: true, message: '认证状态不能为空' }],
@@ -1195,12 +1199,12 @@ export default {
message.warning('组织不能为空')
return
}
if (state.formParam.tlevelId == null) {
if (state.formParam.levelId == null) {
state.log = true
message.warning('讲师级别不能为空')
return
}
if (state.formParam.tsystemId == null) {
if (state.formParam.systemId == null) {
state.log = true
message.warning('讲师体系不能为空')
return
@@ -1257,7 +1261,7 @@ export default {
// }
const handlesel = () => {
console.log('请下选择讲师体系')
if (state.formParam.tsystemId == undefimed) {
if (state.formParam.systemId == undefimed) {
message.warning('请下选择讲师体系')
}
}
@@ -1268,7 +1272,7 @@ export default {
}&pageSize=${state.searchParam.pageSize}
&teacherNameOrUserNo=${state.searchParam.teacherNameOrUserNo ? state.searchParam.teacherNameOrUserNo : ""}
&systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}
&tlevelId=${state.searchParam.tlevelId ? state.searchParam.tlevelId : ""
&levelId=${state.searchParam.levelId ? state.searchParam.levelId : ""
}&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}
&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
@@ -1305,6 +1309,7 @@ export default {
changePagination,
addTeacher,
cancelTeacherDialog,
cancelTeacherDialog1,
handleLook,
cancel,
deleteModal,

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

@@ -335,7 +335,7 @@
<span>您确定要删除此条记录吗</span>
</div>
<div class="del_btnbox">
<div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
<div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
<div class="btnText">取消</div>
</div>
<div class="del_btn btn2" @click="closeDeleteTeacher">
@@ -419,21 +419,10 @@ export default {
entryType: 1,
duration: 0
},
searchParam: {
teacherType: '0',
// userNo: null,//工号姓名
// teacher:null,
teacherNameOrUserNo: null,
name: null,//课程编号
tsystemName: null,//讲师体系
payrollPlaceName: null,//发薪地
entryType: null,
pageNo: "1",
pageSize: "10",
startDate: null,
endDate: null,
beginTime: null,
},
startTime:null,
startDate:null,
searchParam:
{ "teacherType": "0", "pageNo": 1, "pageSize": 10, "managerId": null, "teacherNameOrUserNo": null, "entryType": null, "status": null, "trainorgId": null, "systemId": null, "endDate": null, "startDate":null, "studysranges": [], "score": null }
})
//获取所属组织
@@ -759,10 +748,14 @@ export default {
};
//修改时间
function searchTimeChange(time, timeStr) {
state.searchParam.startDate = timeStr[0];
state.searchParam.endDate = timeStr[1];
console.log( state.searchParam.startDate)
console.log(state.searchParam.endDate)
let startTime = timeStr[0]
let endTime = timeStr[1] ;
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
}
const editTimeChange = (e, date) => {
@@ -772,6 +765,7 @@ export default {
};
//重置
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
teacherType: '0',
pageNo: 1,
@@ -887,9 +881,11 @@ export default {
state.teacherdialog = false
cancel()
}
// state.deleteTeacherdialog = false
};
const cancelTeacherDialog1 = () => {
state.deleteTeacherdialog = false
};
//清空数据
const cancel = () => {
state.formParam = {
@@ -1054,11 +1050,11 @@ export default {
state.log = true
message.warning('组织不能为空')
}
if (state.formParam.tlevelId == null) {
if (state.formParam.levelId == null) {
state.log = true
message.warning('讲师级别不能为空')
}
if (state.formParam.tsystemId == null) {
if (state.formParam.systemId == null) {
state.log = true
message.warning('讲师体系不能为空')
}
@@ -1169,6 +1165,7 @@ export default {
changePagination,
addTeacher,
cancelTeacherDialog,
cancelTeacherDialog1,
handleLook,
cancel,
deleteModal,
@@ -1194,17 +1191,25 @@ export default {
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
}
.addTime {
position: absolute;
z-index: 1;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
::v-deep .ant-picker-range .ant-picker-active-bar {
margin-left: 85px !important;
}
}
.addTimeBox .ant-picker{
padding-left: 85px;
}

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

@@ -22,8 +22,18 @@
</a-select>
</a-form-item>
<a-form-item class="select ">
<a-range-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" @change="searchTimeChange" />
<div class="select addTimeBox">
<div class="addTime" >创建时间：</div>
<a-range-picker
v-model:value="searchdate"
style="width: 420px"
@change="searchTimeChange"
format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</a-form-item>
<div style="display: flex; margin-bottom: 20px">
<a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
@@ -65,7 +75,7 @@
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:10px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
<a-select style="width: 230px ;margin-bottom:10px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList">
</a-select>
</a-form-item>
@@ -263,12 +273,13 @@
remark: null,
kid:null,
},
searchdate: null, //选择时间
searchParam: {
teacherNo:null,
teacherName:null,
trainorgId:null,
kid:null,
tlevelId:null,
levelId:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -444,7 +455,7 @@
},
{
title: '讲师工号 ',
dataIndex: 'teacherId',
dataIndex: 'teacherNo',
key: 'teacherNo',
elipsis: true, align: "center",
width: 120,
@@ -605,12 +616,13 @@
};
//重置
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
endDate:null,
startDate:null,
teacherNo:null,
kid:null,
tlevelId:null,
levelId:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -622,16 +634,16 @@
getTableDate();
};
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
function searchTimeChange(time, timeStr) {
let startTime = timeStr[0]
let endTime = timeStr[1] ;
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
};
}
// List接口数据
const getTableDate = (obj) => {
state.tableLoading=true
@@ -793,8 +805,8 @@
state.currentPage1
}&pageSize=${state.pageSize1}&teacherNo=${
state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
}&tsystemName=${ state.searchParam.tsystemName ? state.searchParam.tsystemName : ""}&tlevelId=${
state.searchParam.tlevelId ? state.searchParam.tlevelId : ""
}&tsystemName=${ state.searchParam.tsystemName ? state.searchParam.tsystemName : ""}&levelId=${
state.searchParam.levelId ? state.searchParam.levelId : ""
}&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${
state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}`
@@ -852,17 +864,25 @@
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
}
.addTime {
position: absolute;
z-index: 1;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
::v-deep .ant-picker-range .ant-picker-active-bar {
margin-left: 85px !important;
}
}
//导出按钮icon
.daochu {

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

@@ -22,8 +22,18 @@
</a-input>
</a-form-item>
<a-form-item class="select ">
<a-range-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" @change="searchTimeChange" />
<div class="select addTimeBox">
<div class="addTime" >创建时间：</div>
<a-range-picker
v-model:value="searchdate"
style="width: 420px"
@change="searchTimeChange"
format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD"
separator="至"
:placeholder="[' 开始时间', ' 结束时间']"
/>
</div>
</a-form-item>
<div style="display: flex; margin-bottom: 20px">
<a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
@@ -65,7 +75,7 @@
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.tlevelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList">
</a-select>
</a-form-item>
@@ -86,7 +96,7 @@
:show-upload-list="false"
:before-upload="beforeUpload2"
>
<a-button class="resetbtn">
<a-button class="resetbtn" @click="handleImport()">
<DownloadOutlined /> 导入
</a-button>
</a-upload>
@@ -94,7 +104,7 @@
<UploadOutlined /> 导出
</a-button>
<div v-if="moreid == 2" style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元 当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
<div style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元 当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
</div>
<!-- 表格 -->
<div style="padding: 10px 0">
@@ -143,7 +153,7 @@
<!-- 弹窗组件 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" >
<!-- 讲师姓名 name 讲师工号 teacherNo-->
<a-row :gutter="16">
<a-col :span="12">
@@ -384,7 +394,9 @@
</a-button>
</div>
</a-drawer>
<ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'"></ImportWork>
</div>
</template>
<script lang="jsx">
import { reactive, toRefs, ref ,watch} from "vue";
@@ -397,6 +409,7 @@
FolderAddOutlined,
DownloadOutlined
} from '@ant-design/icons-vue';
import ImportWork from "../../components/project/ImportWork.vue";
import ProjectManager from "@/components/project/ProjectManagerNew"
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";4
import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
@@ -414,8 +427,11 @@
ProjectManager
},
setup() {
const formRef = ref();
const state = reactive({
teachingdialog:false,
showWork: false,
vf:true,
moreid:1,
byPid:null,
currentPage1: 1,
@@ -442,12 +458,13 @@
defaultTeachingTime:0,
courseName:0
},
searchdate: null, //选择时间
searchParam: {
teacherNo:null,
teacherName:null,
trainorgId:null,
kid:null,
tlevelId:null,
levelId:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -775,12 +792,13 @@ console.log( "讲师体系id" +val);
};
//重置
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
endDate:null,
startDate:null,
teacherNo:null,
kid:null,
tlevelId:null,
levelId:null,
courseType:null,
certStatus:null,
salaryName:null,
@@ -792,16 +810,16 @@ console.log( "讲师体系id" +val);
getTableDate();
};
//修改时间
const searchTimeChange = (e, date) => {
let startTime = date[0] + " 00:00:00";
let endTime = date[1] + " 23:59:59";
function searchTimeChange(time, timeStr) {
let startTime = timeStr[0]
let endTime = timeStr[1] ;
state.startTime = new Date(startTime).getTime();
state.endTime = new Date(endTime).getTime();
// state.searchParam.startDate = new Date(startDate).getTime() ;
// state.searchParam.endDate = new Date(endDate).getTime() ;
state.searchParam.startDate = state.startTime ? state.startTime : null,
state.searchParam.endDate = state.endTime ? state.endTime : null
};
}
// List接口数据
const getTableDate = (obj) => {
state.tableLoading=true
@@ -824,9 +842,10 @@ console.log( "讲师体系id" +val);
state.pageSize1 = pageSize;
getTableDate();
};
// 新增讲师
// 添加讲师费
const addTeacher = () => {
state.teacherdialog = true;
state.vf = true
state.teacherdialogtitle = '添加讲师费'
}
@@ -835,28 +854,39 @@ console.log( "讲师体系id" +val);
state.teacherdialog = true;
state.teacherdialogtitle = '修改信息'
state.kid= record.kid
state.vf = false
TeacherSystem()
}
//保存
const createTeacherDialog = () => {
state.formParam.teachingDate= state.formParam.teachingDate!==null? dayjs(new Date(state.formParam.teachingDate).getTime()).format("YYYY-MM-DD"): "",
console.log(state.formParam);
if (state.formParam.kid != undefined) {
updateTeacherFee (state.formParam).then(response => {
message.success("修改成功");
});
}
else {
formRef.value
.validate()
.then(() => {
if (state.vf == false) {
updateTeacherFee(state.formParam).then(response => {
message.success("修改成功");
state.teacherdialog = false;
cancel()
getTableDate();
});
}
else {
addTeacherFee(state.formParam)
.then((res) => {
message.success("保存成功");
}).catch((err) => {
state.teacherdialog = false;
cancel()
getTableDate();
}).catch((err) => {
console.log(err);
});
}
state.teacherdialog = false;
getTableDate();
};
}
})
.catch(() => {
console.log('error', error);
});
};
//删除弹窗
// const deleteModal = (record) => {
// state.deleteInTeacherdialog = true
@@ -909,6 +939,7 @@ console.log( "讲师体系id" +val);
}
//取消按钮 清空输入的数据
const cancelTeacherDialog = () => {
formRef.value.resetFields();
state.teacherdialog = false
cancel()
};
@@ -944,14 +975,14 @@ console.log( "讲师体系id" +val);
const handleLook = (record) => {
state.teachingdialog = true;
state.teacherdialogtitle = '查看详情'
state.kid= record.kid
state.kid= record.id
// alert(record.grade)
TeacherSystem()
// getteacherrecordstableData ()
}
//详情
const TeacherSystem=()=>{
getTeacherFeeDetail({kid : state.kid}).then((res) => {
getTeacherFeeDetail({id : state.kid}).then((res) => {
// state.formParam=Object.assign({} ,res.data.data)
state.formParam=res.data.data
// tableDataFeeDetail.value = res.data.data.records
@@ -1029,6 +1060,9 @@ console.log( "讲师体系id" +val);
state.searchParam.teacherNo = d;
state.searchParam.teacherName = t;
// state.searchParam.trainorgName=orgName
}
const handleImport = () => {
state.showWork = true
}
//导出功能
const handleExport = ()=>{
@@ -1037,8 +1071,8 @@ console.log( "讲师体系id" +val);
state.currentPage1
}&pageSize=${state.pageSize1}&teacherNo=${
state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
}&kid=${ state.searchParam.kid ? state.searchParam.kid : ""}&tlevelId=${
state.searchParam.tlevelId ? state.searchParam.tlevelId : ""
}&kid=${ state.searchParam.kid ? state.searchParam.kid : ""}&levelId=${
state.searchParam.levelId ? state.searchParam.levelId : ""
}&courseType=${ state.searchParam.courseType ? state.searchParam.courseType : ""}&certStatus=${
state.searchParam.certStatus ? state.searchParam.certStatus : ""
}&salaryName=${state.searchParam.salaryName ? state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}`
@@ -1081,6 +1115,8 @@ console.log( "讲师体系id" +val);
return {
...toRefs(state),
rules,
formRef,
handleImport,
beforeUpload2,
closeDeleteTeacher,
cancelTeachingDialog,
@@ -1132,18 +1168,28 @@ console.log( "讲师体系id" +val);
}
.addTimeBox {
position: relative;
display: flex;
align-items: center;
position: relative;
display: flex;
align-items: center;
.addTime {
position: absolute;
z-index: 10;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.addTime {
position: absolute;
z-index: 1;
margin-left: 10px;
color: rgba(0, 0, 0, 0.4);
}
.ant-picker {
padding-left: 85px;
}
::v-deep .ant-picker-range .ant-picker-active-bar {
margin-left: 85px !important;
}
}
.addTimeBox .ant-picker{
padding-left: 85px;
}
//导出按钮icon
.daochu {
width: 16px;

32
src/views/lecturer/LecturerSystem.vue
View File

@@ -79,7 +79,7 @@
<!-- 抽屉 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<a-row :gutter="16">
<a-col :span="24">
<span class="line"></span><span>讲师体系基本信息</span>
@@ -197,8 +197,10 @@ export default {
},
setup() {
const formRef = ref();
const router = useRouter();
const state = reactive({
vf:true,
tableDataTotal:-1,
tableLoading: false,
deleteInTeacherdialog: false,
@@ -318,6 +320,7 @@ export default {
//取消按钮 清空输入的数据
const cancelTeacherDialog = () => {
if (state.teacherdialog = true) {
formRef.value.resetFields();
state.teacherdialog = false
cancel()
}
@@ -327,12 +330,14 @@ export default {
const addTeacher = () => {
state.teacherdialog = true,
state.teacherdialogtitle = "新增归属组织"
state.vf = true
}
//修改信息弹窗
const handleModify = (record) => {
state.teacherdialog = true;
state.teacherdialogtitle = '修改归属组织'
state.delId = record.kid
state.vf = false
TeacherSystem()
}
//查看
@@ -373,24 +378,32 @@ export default {
}
//保存
const createTeacherDialog = () => {
console.log(state.formParam)
if (state.formParam.kid != undefined) {
updateSystem(state.formParam).then(response => {
formRef.value
.validate()
.then(() => {
if (state.vf == false) {
updateSystem(state.formParam).then(response => {
message.success("修改成功");
state.teacherdialog = false;
cancel()
getTableDate();
});
}
else {
addLecturerSystem(state.formParam)
.then((res) => {
message.success("保存成功");
state.teacherdialog = false;
cancel()
getTableDate();
}).catch((err) => {
console.log(err);
});
}
cancel()
state.teacherdialog = false;
getTableDate();
}
})
.catch(() => {
console.log('error', error);
});
};
const rules = {
kid: [{ required: true, message: '讲师体系编号不能为空' }],
@@ -421,6 +434,7 @@ export default {
return {
...toRefs(state),
rules,
formRef,
getteacherrecordstableData,
inputRemove,
inputAdd,

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

@@ -80,7 +80,7 @@
<!-- 抽屉 -->
<a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
width="60%" :title="teacherdialogtitle">
<a-form :model="formParam" :rules="rules" layout="vertical">
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
<a-row :gutter="16">
<a-col :span="24">
<span class="line"></span><span>讲师体系基本信息</span>
@@ -192,8 +192,9 @@ export default{
},
setup() {
const formRef = ref();
const state = reactive({
vf:true,
showContent: false,
tableLoading:false,
deleteInTeacherdialog:false,
@@ -305,7 +306,9 @@ const getTableDate = (obj) => {
//取消按钮 清空输入的数据
const cancelTeacherDialog = () => {
if (state.teacherdialog = true) {
formRef.value.resetFields();
state.teacherdialog = false
cancel()
}
state.deleteInTeacherdialog = false
@@ -314,6 +317,7 @@ const getTableDate = (obj) => {
const addTeacher=()=>{
state.teacherdialog=true ,
state.teacherdialogtitle="新增归属组织"
state.vf = true
}
const addContentData = () => {
state.showContent = true
@@ -323,6 +327,7 @@ const getTableDate = (obj) => {
state.teacherdialog = true;
state.teacherdialogtitle = '修改归属组织'
state.formParam.kid= record.kid
state.vf = false
TeacherSystem(record)
}
const TeacherSystem =(record)=>{
@@ -340,23 +345,30 @@ const getTableDate = (obj) => {
}
//保存
const createTeacherDialog = () => {
console.log(state.formParam);
if (state.formParam.kid != undefined) {
updateTrainOrg(state.formParam).then(response => {
formRef.value
.validate()
.then(() => {
if (state.vf == false) {
updateTrainOrg(state.formParam).then(response => {
message.success("修改成功");
state.teacherdialog = false;
cancel()
getTableDate();
});
}
else {
addReviewer(state.formParam)
.then((res) => {
message.success("保存成功");
}).catch((err) => {
console.log(err);
});
}
cancel()
state.teacherdialog = false;
state.teacherdialog = false;
cancel()
getTableDate();
})
}
})
.catch(() => {
console.log('error', error);
});
};
const rules = {
trainorgId: [{ required: true, message: '归属组织编号不能为空' }],
@@ -371,6 +383,7 @@ const getTableDate = (obj) => {
return{
...toRefs(state),
rules,
formRef,
managerChange,
columns,
tableData,

244
src/views/projectcenter/AddOrgContent.vue Normal file
View File

@@ -0,0 +1,244 @@
<template>
<div class="twoDimensionalCode">
<!--选择教师专长页面 -->
<a-modal
:visible="showContent"
:footer="null"
:closable="closableQR"
wrapClassName="codeModal"
style="margin-top: 400px"
:zIndex="9999"
@cancel="qr_exit"
>
<div class="QR">
<div class="qr_header"></div>
<div class="qr_main">
<div class="qrm_header">
<span style="title">{{Addtitle}}</span>
<div class="close_exit" @click="closeCodeModal"></div>
</div>
<div class="line"></div>
<div class="content">
<div class="left">
<a-tree checkable :tree-data="treeData" :loading="orgLoading"
:load-data="onLoadData" v-model:expandedKeys="expandedKeys"
v-model:selectedKeys="selectedKeys"
v-model:checkedKeys="checkedKeys" :fieldNames="{
children: 'treeChildList',
key: 'id',
title: 'name',
value: 'name',
}" @check="onCheck">
</a-tree>
</div>
<div class="right">
<div class="headers">
<div>已选择标签<span style="color: #4ea6ff;margin-left:5px;">{{treeAddData?.length}}</span>个</div>
<div class="header_right" @click="clearTree">清空</div>
</div>
<div class="tags">
<div
class="tag"
v-for="(item, index) in treeAddData"
:key="index"
>
<div>{{ item?.name }}</div>
<div @click="deleteTree(item)" class="tag_delete">+</div>
</div>
</div>
</div>
</div>
</div>
<div class="footer">
<a-button style="margin-right: 20px;" @click="closeCodeModal">取消</a-button>
<a-button type="primary" @click="queryCreate">确定</a-button>
</div>
</div>
</a-modal>
</div>
</template>
<script setup>
import { reactive, toRefs, watch,ref,computed } from "vue";
import { message } from "ant-design-vue";
import { useStore } from "vuex";
import { ORG_CHILD_LIST, ORG_LIST} from "@/api/apis";
import { defineProps,defineEmits } from "vue";
import { request, useRequest} from "@/api/request";
const props = defineProps({
showContent: {
type: Boolean,
default: false,
},
Addtitle:{
type:String,
default: true,
},
AddContentList:{
type:Array,
default: ()=>[],
}
})
const emit = defineEmits({})
const treeAddData = ref([])
const { data: treeData, loading: orgLoading } = useRequest(
ORG_LIST,
{ keyword: "" },
);
function onLoadData(treeNode) {
return request(ORG_CHILD_LIST, { keyword: "", orgId: treeNode.id }).then(
(r) => {
// r.data.map(item=>item.disabled = true)
treeNode.dataRef.treeChildList = r.data;
treeData.value = [...treeData.value];
}
);
}
watch(()=>props.showContent, (val) => {
if(!val){
expandedKeys.value = []
selectedKeys.value = []
checkedKeys.value = []
}
});
const onCheck = (checkedKeys, {checked: bool, checkedNodes, node, event}) => {
treeAddData.value = checkedNodes.filter(node => !node.treeChildList || node.treeChildList.length === 0);
}
const clearTree = () => {
treeAddData.value = [];
checkedKeys.value = [];
}
const deleteTree = (item) => {
treeAddData.value = treeAddData.value.filter(node => node.id !== item.id);
checkedKeys.value = treeAddData.value.map(item=>item.id)
}
const closeCodeModal = () => {
emit("update:showContent", false);
clearTree()
};
const queryCreate = () => {
emit("AddContentList", treeAddData.value);
closeCodeModal()
}
const expandedKeys = ref([]);
const selectedKeys = ref([]);
const checkedKeys = ref([]);
</script>
<style scoped lang="scss">
.twoDimensionalCode {
}
.codeModal {
.ant-modal {
.ant-modal-content {
width: 479px !important;
.ant-modal-body {
.QR {
z-index: 9999;
width: 700px;
background: #ffffff;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
position: absolute;
left: 50%;
top: 10%;
transform: translate(-50%, -50%);
.qr_header {
position: absolute;
width: calc(100%);
height: 40px;
// background: linear-gradient(
// rgba(78, 166, 255, 0.2) 0%,
// rgba(78, 166, 255, 0) 100%
// );
}
.qr_main {
width: 100%;
position: relative;
.qrm_header {
display: flex;
align-items: center;
padding-top: 20px;
padding-left: 26px;
font-size: 16px;
.title {
font-size: 16px;
font-weight: 600;
color: #333333;
line-height: 22px;
}
.close_exit {
position: absolute;
right: 42px;
cursor: pointer;
width: 20px;
height: 20px;
background-image: url(@/assets/images/coursewareManage/close.png);
background-size: 100% 100%;
}
}
.line{
height: 1px;
margin-top: 16px;
background-color: #666666;
}
.content{
display: flex;
min-height: 500px;
.left{
width: 50%;
border-right: 1px solid #666666;
padding: 30px 15px;
max-height: 600px;
overflow-y: auto;
}
.right{
width: 50%;
// max-height: 600px;
// overflow-y: auto;
.headers{
display: flex;
justify-content: space-between;
margin: 30px 15px;
.header_right{
color: #666666;
cursor: pointer;
}
}
.tags{
max-height: 500px;
overflow-y: auto;
padding: 0 15px;
.tag{
height: 44px;
padding: 0 15px;
display: flex;
justify-content: space-between;
align-items: center;
.tag_delete{
display: none;
color: #4ea6ff;
transform: rotate(45deg);
font-size: 26px;
cursor: pointer;
}
}
.tag:hover .tag_delete {
display: block;
}
.tag:hover {
background-color: aliceblue;
}
}
}
}
}
.footer{
height: 60px;
text-align: right;
padding: 13px 30px;
border-top: 1px solid #666666;
}
}
}
}
}
}
</style>