diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue index fe8197ea..d5a550aa 100644 --- a/src/components/project/BatchLecturer.vue +++ b/src/components/project/BatchLecturer.vue @@ -3,7 +3,7 @@ :visible="visible" class="drawerStyle RouterFaceStu" placement="right" - width="1200" + width="80%" >
@@ -213,7 +213,7 @@ const queryDrawer = () => { return } emit("selectedRowKeys", selectedRowKeys.value) - closeDrawer() + // closeDrawer() } diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 024becf9..451280ac 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -3,7 +3,7 @@ :visible="visible" class="drawerStyle RouterFaceStu" placement="right" - width="1200" + width="60%" >
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 30dfe53c..371392a2 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -152,7 +152,7 @@ - @@ -168,7 +168,7 @@ state.formParam.orgNames, (val) => { + console.log(val, 'orgName') + if(val){ + const parts = val.split('/'); + const reversedParts = parts.reverse(); + state.formParam.orgName = reversedParts.join('/'); + } + }) //保存 const createTeacherDialog = async () => { state.formParam.teacherName = state.formParam.name?.split('/')[0] @@ -906,6 +914,7 @@ export default { return message.error(rules[formItemNames[i]][0].log) } } + state.formParam.orgName = state.formParam.orgNames state.formParam = {...state.formParam,...state.tSystemNames} console.log( state.formParam) if (state.vf == false) { @@ -1056,6 +1065,7 @@ export default { 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 HH:mm' ), + state.formParam.orgNames = state.formParam.orgName console.log( state.formParam); }) .catch((err) => { diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 5f80d964..d579783e 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -368,10 +368,13 @@ { value: 2, label: "路径开课" }, { value: 3, label: "面授开课" }, ]) - //认证状态 + //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝 const AuthenticationStatusList = ref([ - { value: 0, label: "未认证" }, - { value: 1, label: "已认证" }, + { value: 0, label: "待确认" }, + { value: 1, label: "待提交" }, + { value: 2, label: "审核中" }, + { value: 3, label: "审核通过" }, + { value: 4, label: "审核拒绝" }, ]) //状态 diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 28684ebe..1d7c6954 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -17,14 +17,14 @@
- - + +
-
创建时间:
+
授课日期:
- + - @@ -180,7 +180,7 @@ - + @@ -244,7 +244,7 @@ - @@ -369,19 +369,19 @@ {{formParam.orgName}} {{formParam.tsystemName}} {{formParam.tlevelName }} - {{formParam.payrollPlace}} - "费用类型(未命名)" - {{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':''}} - {{formParam.courseName}} - {{formParam.teachingDate}} - {{formParam.teachingDate}} - {{formParam.studys}} - {{formParam.score}} - {{formParam.levelPay}} - {{formParam.expense}} - {{formParam.payableExpense}} - {{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':''}} - {{formParam.remark}} + {{formParam?.payrollPlace || '-'}} + "差字段" + {{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}} + {{formParam.courseName || '-'}} + {{formParam.teachingDate || '-'}} + {{formParam.teachingDate || '-'}} + {{formParam.studys || '-'}} + {{formParam.score || '-'}} + {{formParam.levelPay || '-'}} + {{formParam.expense || '-'}} + {{formParam.payableExpense || '-'}} + {{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':'-'}} + {{formParam.remark || '-'}}