From a881058e44362bcb5587d9a165e6c17fe746cd3f Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Wed, 4 Sep 2024 17:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/ExternalLecturer.vue | 11 +- src/views/lecturer/ExternalTeaching.vue | 103 +++++---- src/views/lecturer/InsideLecturer.vue | 53 ++--- src/views/lecturer/InsideTeaching.vue | 71 ++++--- src/views/lecturer/LecturerApproval.vue | 64 ++++-- src/views/lecturer/LecturerFee.vue | 124 +++++++---- src/views/lecturer/LecturerSystem.vue | 32 ++- src/views/lecturer/Organization.vue | 35 +++- src/views/projectcenter/AddOrgContent.vue | 244 ++++++++++++++++++++++ 9 files changed, 560 insertions(+), 177 deletions(-) create mode 100644 src/views/projectcenter/AddOrgContent.vue diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 57eab875..f0b3d297 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -200,7 +200,7 @@ 您确定要删除此讲师吗
-
+
取消
@@ -226,7 +226,7 @@ 确定要将该讲师停用吗
停用后讲师不可登录教师端
-
+
取消
@@ -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 } }, diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 5de85b09..4f925d89 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -9,12 +9,8 @@ -
- -
+ - - +
+
创建时间：
+ +
+
查询 @@ -109,7 +115,7 @@ - + @@ -252,7 +258,7 @@ 您确定要删除此条记录吗
-
+
取消
@@ -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 { diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 42819374..e786b41b 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -16,7 +16,7 @@ - @@ -171,16 +171,16 @@ - - + - +
-
@@ -347,15 +347,15 @@ - - + - - + @@ -483,7 +483,7 @@ 您确定要删除此讲师吗
-
+
取消
@@ -510,7 +510,7 @@ 确定要将该讲师停用吗
停用后讲师不可登录教师端
-
+
取消
@@ -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, diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 4ee31710..d9d0f95e 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -335,7 +335,7 @@ 您确定要删除此条记录吗
-
+
取消
@@ -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; } diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 3fdfd884..1ff4257d 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -22,8 +22,18 @@ - +
+
创建时间：
+ +
查询 @@ -65,7 +75,7 @@ - @@ -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 { diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index b51c488f..9038375a 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -22,8 +22,18 @@ - +
+
创建时间：
+ +
查询 @@ -65,7 +75,7 @@ - @@ -86,7 +96,7 @@ :show-upload-list="false" :before-upload="beforeUpload2" > - + 导入 @@ -94,7 +104,7 @@ 导出 -
当前页面汇总金额：1,230,490元 当前总汇总金额：9,230,490元
+
当前页面汇总金额：1,230,490元 当前总汇总金额：9,230,490元
@@ -143,7 +153,7 @@ - + @@ -384,7 +394,9 @@
+
+ +