diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue index 8a132b1c..cf292b80 100644 --- a/src/components/lecturer/ImportWork.vue +++ b/src/components/lecturer/ImportWork.vue @@ -355,7 +355,7 @@ import {getCookieForName} from "@/api/method"; .line{ height: 1px; margin-top: 16px; - background-color: #666666; + background-color: #f0f0f0; } .contents{ display: flex; diff --git a/src/components/project/AddContent.vue b/src/components/project/AddContent.vue index d475e458..a8e3ccfc 100644 --- a/src/components/project/AddContent.vue +++ b/src/components/project/AddContent.vue @@ -198,14 +198,14 @@ export default { .line{ height: 1px; margin-top: 16px; - background-color: #666666; + background-color: #e8e8e8; } .content{ display: flex; min-height: 500px; .left{ width: 50%; - border-right: 1px solid #666666; + border-right: 1px solid #e8e8e8; padding: 30px 15px; max-height: 600px; overflow-y: auto; @@ -255,7 +255,7 @@ export default { height: 60px; text-align: right; padding: 13px 30px; - border-top: 1px solid #666666; + border-top: 1px solid #e8e8e8; } } } diff --git a/src/components/project/AddOrgContent.vue b/src/components/project/AddOrgContent.vue index 6514e441..911ca8e7 100644 --- a/src/components/project/AddOrgContent.vue +++ b/src/components/project/AddOrgContent.vue @@ -42,7 +42,7 @@ v-for="(item, index) in treeAddData" :key="index" > -
{{ item?.name }} - (原：{{ item?.orgName || '-' }})
+
{{ item?.orgName }} - (原：{{ item?.affiliationName || '-' }})
+
@@ -125,6 +125,7 @@ import * as lecturerApi from "@/api/Lecturer.js"; } if(treeData.value.length){ treeData.value.map(item=>{ + item.name = item.name?.split('(')[0] notLists.value.some(i=>{ if(i.orgId == item.id){ item.disabled = true @@ -158,11 +159,12 @@ import * as lecturerApi from "@/api/Lecturer.js"; return item; } try { - const orgItem = orgLists.value?.find(i => i && i.id == item.id); + const orgItem = orgLists.value?.find(i => i && i.orgId == item.id); if (orgItem) { item.isSelect = orgItem.isSelect; item.orgName = orgItem.orgName; item.leaders = orgItem.leaders; + item.affiliationName = orgItem.affiliationName } return { orgId: item.id, @@ -252,14 +254,14 @@ import * as lecturerApi from "@/api/Lecturer.js"; .line{ height: 1px; margin-top: 16px; - background-color: #666666; + background-color: #e8e8e8; } .content{ display: flex; min-height: 500px; .left{ width: 50%; - border-right: 1px solid #666666; + border-right: 1px solid #e8e8e8; padding: 30px 15px; max-height: 600px; overflow-y: auto; @@ -315,7 +317,7 @@ import * as lecturerApi from "@/api/Lecturer.js"; height: 60px; text-align: right; padding: 13px 30px; - border-top: 1px solid #666666; + border-top: 1px solid #e8e8e8; } } } diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 22e4d30c..fa67f22e 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -143,11 +143,16 @@ const handleConfirm = () => { } api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{ console.log(res,'resssss') - api.submitApproval({ids:ids?.join(',')}).then(res=>{ + api.submitApproval({ids:res.data?.data?.join(',')}).then(res=>{ console.log(res,'resssss') message.success('提交成功') close() closeDrawer() + }).catch(err=>{ + message.destroy() + message.error(err.data.msg) + close() + closeDrawer() }) }).catch(err=>{ message.destroy() diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index dd592694..911cb9df 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -16,7 +16,7 @@ v-model:value="labelValue" style="width: 100%" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" - placeholder="请选择归属组织" + :placeholder="placeholder" :labelInValue="true" allow-clear v-model:treeExpandedKeys="stuTreeExpandedKeys" @@ -46,6 +46,10 @@ const props = defineProps({ type: Boolean, default: false, }, + placeholder: { + type: String, + default: "请选择归属组织" + } }); const emit = defineEmits({}); const stuTreeExpandedKeys = ref([]); diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index a16180e2..5bcc69ea 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -11,12 +11,11 @@
{{ title }}
- - 返回 + />
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 2aeb640a..b5ad4189 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -63,8 +63,16 @@
- + +
+
{{ teacherdialogtitle }}
+ +
@@ -815,6 +823,24 @@ export default { ::v-deep .ant-upload.ant-upload-select-picture-card { border-radius: 50% !important; } +.headers { + height: 73px; + border-bottom: 1px solid #e8e8e8; + display: flex; + justify-content: space-between; + align-items: center; + // background-color: red; + margin-bottom: 20px; + flex-shrink: 0; + + .headerTitle { + font-size: 18px; + font-weight: 600; + color: #333333; + line-height: 25px; + // margin-left: 24px; + } +} //导出按钮icon .daochu { width: 16px; diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 0ea62224..648e5885 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -28,32 +28,13 @@ v-on:keydown.enter="enterPressHadlerSearch" />
-
- 查询 - - - 重置 - - -
- 展开 - - -
-
- 返回 - - -
-
-
- + - + - + +
+ 查询 + + + 重置 + + + +
+
+
@@ -124,8 +125,16 @@
- + +
+
{{ teacherdialogtitle }}
+ +
@@ -239,27 +248,35 @@ - - - {{ formParam.teacherName }} - {{ formParam.mobile }} - {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' + +
+
查看讲师授课记录
+ +
+ + {{ formParam.teacherName ||'-'}} + {{ formParam.mobile ||'-'}} + {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '-' }} - {{ formParam.courseName }} + {{ formParam.courseName ||'-'}} {{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1 - ? '已开课' : '' }} - {{ formParam.courseTypeName }} - {{ formParam.teachingDate }} + ? '已开课' : '-' }} + {{ formParam.courseTypeName ||'-'}} + {{ formParam.teachingDate ||'-' }} - {{ formParam.teaching }} 分钟 + {{ formParam.teaching }} 分钟 ({{ (formParam.teaching / 60 ).toFixed(2) }}小时) - {{ formParam.score }} - {{ formParam.studys }} - {{ formParam.remark }} + {{ formParam.score ||'-'}} + {{ formParam.studys ||'-'}} + {{ formParam.remark ||'-' }}
--> - + + + + + + + + + + + +
查询 @@ -30,33 +45,19 @@ 重置 -
+ +
- - - - - - - - - - - - +
@@ -114,7 +115,7 @@ -
+
{{ teacherdialogtitle }}
--> - @@ -146,8 +146,16 @@
- + +
+
{{ teacherdialogtitle }}
+ +
@@ -270,7 +278,7 @@ + style="width: 100%; height: 100px; border-radius: 8px;margin-bottom:62px;" placeholder="请输入" /> @@ -292,40 +300,48 @@
- + +
+
查看讲师授课记录
+ +
讲师信息 - - {{ formParam.teacherName }} - {{ formParam.userNo }} - {{ formParam.orgName }} - {{ formParam.tsystemName }} - {{ formParam.tlevelName + + {{ formParam.teacherName ||'-'}} + {{ formParam.userNo||'-' }} + {{ formParam.orgName||'-' }} + {{ formParam.tsystemName||'-' }} + {{ formParam.tlevelName||'-' }} {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '-' }} - {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' + {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '-' }} - {{ formParam.courseName }} + {{ formParam.courseName||'-' }} {{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1 - ? '已开课' : '' }} + ? '已开课' : '-' }} {{ formParam.teaching }} 分钟 ({{ (formParam.teaching / 60 ).toFixed(2) }}小时) - {{ formParam.teachingDate }} - {{ formParam.studys }} - {{ formParam.score }} - {{ formParam.courseTypeName }} - {{ formParam.remark }} + {{ formParam.teachingDate||'-' }} + {{ formParam.studys||'-' }} + {{ formParam.score||'-' }} + {{ formParam.courseTypeName||'-' }} + {{ formParam.remark||'-' }}
-
+
讲师费发放情况
-